- dropped outdated wxWidgets patch, use sed call to set wx-config path;

[packages/gpac.git] / gpac-install.patch

diff --git a/gpac-install.patch b/gpac-install.patch
index 317e4a089b71bceb8bd43b07ef59358047c51e53..5b4f526e48869c985a69d021d767e1a6e11c20c8 100644 (file)
--- a/gpac-install.patch
+++ b/gpac-install.patch
@@ -1,49 +1,38 @@
---- gpac/Makefile.orig 2006-03-17 22:16:39.000000000 +0100
-+++ gpac/Makefile      2006-03-17 22:17:29.000000000 +0100
-@@ -71,8 +71,8 @@
+--- gpac/Makefile.orig 2008-10-23 17:40:38.000000000 +0200
++++ gpac/Makefile      2011-02-05 07:18:41.996686361 +0100
+@@ -59,9 +59,6 @@
  ifeq ($(CONFIG_WIN32),yes)
-       install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib
+       install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/$(libdir)
  else
--      install -s -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
--      ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
-+      install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
-+      ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
- #not sure wether darwin uses ldconfig or not...
+-ifeq ($(DEBUGBUILD),no)
+-      $(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX)
+-endif
  ifeq ($(CONFIG_DARWIN),yes)
+       install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+       ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
+--- gpac/applications/osmozilla/Makefile.orig  2008-11-24 09:54:12.000000000 +0100
++++ gpac/applications/osmozilla/Makefile       2011-02-05 07:20:46.968690551 +0100
+@@ -6,10 +6,6 @@
+ USER_NAME=root
  else
---- gpac/Makefile.orig 2006-03-17 22:27:49.000000000 +0100
-+++ gpac/Makefile      2006-03-17 22:27:58.000000000 +0100
-@@ -64,7 +64,7 @@
-       install -c -s -m 755 bin/gcc/MP4Box "$(prefix)/bin"
-       install -c -s -m 755 bin/gcc/MP42Avi "$(prefix)/bin"
-       $(MAKE) -C applications install
--      install -d "$(moddir)"
-+      install -d "$(libdir)/gpac"
-       install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)"
-       rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX)
-       rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
---- gpac/applications/osmozilla/Makefile.orig  2006-03-17 22:47:48.000000000 +0100
-+++ gpac/applications/osmozilla/Makefile       2006-03-17 22:54:03.000000000 +0100
-@@ -5,10 +5,6 @@
- GECKO_PATH=$(SRC_PATH)/extra_lib/include/gecko-sdk
- 
  USER_NAME=$(shell whoami)
 -ifeq ($(USER_NAME), root)
 -else
 -MOZILLA_DIR=local
 -endif
+ endif
  
- CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include \
-   -I$(GECKO_PATH) \
-@@ -71,18 +67,8 @@
+ CFLAGS=$(CPPFLAGS) $(XUL_CFLAGS) -I$(SRC_PATH)/include
+@@ -75,19 +71,8 @@
  endif
  
- install: $(LIB)
+ install: 
 -ifeq ($(MOZILLA_DIR), local)
 -ifeq ($(USER_NAME), root)
 -      @echo "*** Root cannot install local mozilla plugins! ***"
 -      @echo "*** Exit root mode and reinstall mozilla plugin! ***"
 -else
+-      $(MAKE) $(LIB)
 -      install -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)"
 -      install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt"
 -endif
@@ -54,20 +43,5 @@
 +      install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)"
 +      install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt"
  
- dep: depend
- 
---- gpac/Makefile.orig 2006-03-17 22:55:15.000000000 +0100
-+++ gpac/Makefile      2006-03-17 22:56:22.000000000 +0100
-@@ -65,9 +65,9 @@
-       install -c -s -m 755 bin/gcc/MP42Avi "$(prefix)/bin"
-       $(MAKE) -C applications install
-       install -d "$(libdir)/gpac"
--      install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)"
--      rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX)
--      rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
-+      install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(libdir)/gpac"
-+      rm -f $(libdir)/libgpac.$(DYN_LIB_SUFFIX)
-+      rm -f $(libdir)/nposmozilla.$(DYN_LIB_SUFFIX)
- ifeq ($(CONFIG_WIN32),yes)
-       install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib
- else
+ uninstall:
+ ifeq ($(MOZILLA_DIR), local)