- ffmpeg2 fixes from upstream svn

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

diff --git a/gpac-install.patch b/gpac-install.patch
index 26127f28b4c724c768450a30477dd6be03d1c67c..5b4f526e48869c985a69d021d767e1a6e11c20c8 100644 (file)
--- a/gpac-install.patch
+++ b/gpac-install.patch
@@ -1,35 +1,47 @@
---- gpac/Applications/MP4Client/Makefile.orig  2005-04-09 04:10:13.000000000 +0200
-+++ gpac/Applications/MP4Client/Makefile       2005-04-09 04:10:23.000000000 +0200
-@@ -13,7 +13,7 @@
- OBJS= main.o 
- 
- ifeq ($(BUILD_INSTALL), yes)
--INSTALL_FLAGS=-DM4_PLUGIN_PATH=\"$(plugdir)\"
-+INSTALL_FLAGS=-DM4_PLUGIN_PATH=\"$(real_plugdir)\"
+--- 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 $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/$(libdir)
  else
- INSTALL_FLAGS=
- endif
---- gpac/Applications/Osmo4_wx/Makefile.orig   2005-04-09 04:10:42.000000000 +0200
-+++ gpac/Applications/Osmo4_wx/Makefile        2005-04-09 04:10:52.000000000 +0200
-@@ -13,7 +13,7 @@
- OBJS= wxOsmo4.o wxGPACControl.o fileprops.o Playlist.o menubtn.o
- 
- ifeq ($(BUILD_INSTALL), yes)
--INSTALL_FLAGS=-DM4_PLUGIN_PATH=\"$(plugdir)\"
-+INSTALL_FLAGS=-DM4_PLUGIN_PATH=\"$(real_plugdir)\"
+-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
- INSTALL_FLAGS=
+ USER_NAME=$(shell whoami)
+-ifeq ($(USER_NAME), root)
+-else
+-MOZILLA_DIR=local
+-endif
  endif
---- gpac/Makefile.orig 2005-01-31 15:41:05.000000000 +0100
-+++ gpac/Makefile      2005-04-27 12:33:09.000000000 +0200
-@@ -73,8 +73,8 @@
- ifeq ($(CONFIG_WIN32),yes)
-       install -s -m 755 bin/gcc/libm4systems.dll $(prefix)/lib
- else
--      install -s -m 755 bin/gcc/libm4systems.so $(prefix)/lib/libm4systems-$(VERSION).so
--      ln -sf libm4systems-$(VERSION).so $(prefix)/lib/libm4systems.so
-+      install -m 755 bin/gcc/libm4systems.so $(libdir)/libm4systems-$(VERSION).so
-+      ln -sf libm4systems-$(VERSION).so $(libdir)/libm4systems.so
-       ldconfig || true
+ 
+ CFLAGS=$(CPPFLAGS) $(XUL_CFLAGS) -I$(SRC_PATH)/include
+@@ -75,19 +71,8 @@
  endif
-       install -d "$(mandir)/man1"
+ 
+ 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
+-else
+-      install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/components/$(LIB)"
+-      install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/components/nposmozilla.xpt"
+-endif
++      install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)"
++      install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt"
+ 
+ uninstall:
+ ifeq ($(MOZILLA_DIR), local)