packages: gpac/gpac-flags.patch, gpac/gpac.spec - rel 6; avoid -L/usr/lib

[arekm]

Author: arekm                        Date: Sun Jul 24 15:08:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; avoid -L/usr/lib

---- Files affected:
packages/gpac:
   gpac-flags.patch (1.1 -> 1.2) , gpac.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/gpac/gpac-flags.patch
diff -u packages/gpac/gpac-flags.patch:1.1 packages/gpac/gpac-flags.patch:1.2
--- packages/gpac/gpac-flags.patch:1.1	Sun May 29 21:55:01 2011
+++ packages/gpac/gpac-flags.patch	Sun Jul 24 17:07:56 2011
@@ -20,3 +20,52 @@
  
  %.o: %.cpp
  	$(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $< 
+--- gpac/src/Makefile~	2011-07-24 16:46:39.000000000 +0200
++++ gpac/src/Makefile	2011-07-24 16:53:33.607729885 +0200
+@@ -106,14 +106,6 @@
+ endif
+ 
+ 
+-ifneq ($(prefix), /usr/local)
+-EXTRALIBS+=-L$(prefix)/lib
+-else
+-ifneq ($(prefix), /usr)
+-EXTRALIBS+=-L$(prefix)/lib
+-endif
+-endif
+-
+ ## libgpac compositor compilation options
+ COMPOSITOR_CFLAGS=
+ ## SVG disabled
+--- gpac/applications/mp4client/Makefile~	2011-07-24 16:54:03.000000000 +0200
++++ gpac/applications/mp4client/Makefile	2011-07-24 16:57:28.613989434 +0200
+@@ -37,18 +37,6 @@
+ PROG=MP4Client
+ endif
+ 
+-ifneq ($(CONFIG_JPEG), no)
+-LINKLIBS+= -L$(prefix)/lib
+-else
+-ifneq ($(CONFIG_PNG), no)
+-LINKLIBS+= -L$(prefix)/lib
+-else
+-ifneq ($(TRISCOPE_MODE), no)
+-LINKLIBS+= -L$(prefix)/lib
+-endif
+-endif
+-endif
+-
+ ifeq ($(CONFIG_JPEG), no)
+ else
+ LINKLIBS+= -ljpeg
+--- gpac/modules/jack/Makefile~	2008-11-24 10:14:19.000000000 +0100
++++ gpac/modules/jack/Makefile	2011-07-24 17:01:53.625253667 +0200
+@@ -32,7 +32,7 @@
+ all: $(LIB)
+ 
+ $(LIB): $(OBJSPIC)
+-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib  -ljack
++	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack
+ 
+ 
+ %.o: %.c

================================================================
Index: packages/gpac/gpac.spec
diff -u packages/gpac/gpac.spec:1.37 packages/gpac/gpac.spec:1.38
--- packages/gpac/gpac.spec:1.37	Sun Jul 24 16:38:30 2011
+++ packages/gpac/gpac.spec	Sun Jul 24 17:07:56 2011
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1)
 Name:		gpac
 Version:	0.4.5
-Release:	5
+Release:	6
 License:	LGPL v2+
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz
@@ -237,6 +237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/07/24 15:07:56  arekm
+- rel 6; avoid -L/usr/lib
+
 Revision 1.37  2011/07/24 14:38:30  arekm
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac-flags.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac.spec?r1=1.37&r2=1.38&f=u