SOURCES: gpac-install.patch, gpac-wxWidgets.patch - updated to 0.4...

maciek2w maciek2w at pld-linux.org
Sun Mar 19 13:43:49 CET 2006 

Author: maciek2w                     Date: Sun Mar 19 12:43:49 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 0.4.0
- changed licence to LGPL
- added subpackage with browser plugin

---- Files affected:
SOURCES:
   gpac-install.patch (1.4 -> 1.5) , gpac-wxWidgets.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/gpac-install.patch
diff -u SOURCES/gpac-install.patch:1.4 SOURCES/gpac-install.patch:1.5
--- SOURCES/gpac-install.patch:1.4	Thu Apr 28 21:17:23 2005
+++ SOURCES/gpac-install.patch	Sun Mar 19 13:43:43 2006
@@ -1,35 +1,73 @@
---- 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	2006-03-17 22:16:39.000000000 +0100
++++ gpac/Makefile	2006-03-17 22:17:29.000000000 +0100
+@@ -71,8 +71,8 @@
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib
  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)\"
+-	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 ($(CONFIG_DARWIN),yes)
  else
- INSTALL_FLAGS=
+--- 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
+ 
+ CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include \
+   -I$(GECKO_PATH) \
+@@ -71,18 +67,8 @@
  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 @@
+ 
+ install: $(LIB)
+-ifeq ($(MOZILLA_DIR), local)
+-ifeq ($(USER_NAME), root)
+-	@echo "*** Root cannot install local mozilla plugins! ***"
+-	@echo "*** Exit root mode and reinstall mozilla plugin! ***"
+-else
+-	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"
+ 
+ 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/libm4systems.dll $(prefix)/lib
+ 	install -s -m 755 bin/gcc/libgpac.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
- endif
- 	install -d "$(mandir)/man1"

================================================================
Index: SOURCES/gpac-wxWidgets.patch
diff -u SOURCES/gpac-wxWidgets.patch:1.1 SOURCES/gpac-wxWidgets.patch:1.2
--- SOURCES/gpac-wxWidgets.patch:1.1	Sat Apr  9 22:02:42 2005
+++ SOURCES/gpac-wxWidgets.patch	Sun Mar 19 13:43:44 2006
@@ -1,22 +1,22 @@
---- gpac/configure.orig	2005-03-31 20:42:08.000000000 +0200
-+++ gpac/configure	2005-04-09 04:02:36.000000000 +0200
-@@ -588,8 +588,8 @@
+--- gpac/configure.orig	2005-07-23 19:59:27.000000000 +0200
++++ gpac/configure	2006-03-19 12:18:44.000000000 +0100
+@@ -689,8 +689,8 @@
  #look for wxWidgets support
  has_wx="no"
  wx_too_old="no"
--wx_cflags=`wx-config --cxxflags`
+-wx_cflags=`wx-config --cppflags`
 -wx_lflags=`wx-config --libs`
-+wx_cflags=`wx-gtk2-ansi-config --cxxflags`
++wx_cflags=`wx-gtk2-ansi-config --cppflags`
 +wx_lflags=`wx-gtk2-ansi-config --libs`
  
  cat > $TMPCPP << EOF
  #include <wx/wx.h>
-@@ -597,7 +597,7 @@
+@@ -698,7 +698,7 @@
  EOF
  
  if $cc $wx_cflags -o $TMPO $TMPCPP $wx_lflags > /dev/null 2>&1 ; then
 -wx_version=`wx-config --version | sed 's/[^0-9]//g'`
 +wx_version=`wx-gtk2-ansi-config --version | sed 's/[^0-9]//g'`
- if test "$wx_version" -lt 252 ; then
+ if test "$wx_version" -lt 254 ; then
  wx_too_old="yes"
  else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gpac-install.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/gpac-wxWidgets.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list