rpms/gpac/devel gpac.spec, 1.32, 1.33 gpac-0.4.6_15-soname.patch, 1.1, 1.2
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29111
Modified Files:
gpac.spec gpac-0.4.6_15-soname.patch
Log Message:
Update gpac-soname.patch
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gpac.spec 23 Sep 2011 12:48:02 -0000 1.32
+++ gpac.spec 3 Oct 2011 20:29:28 -0000 1.33
@@ -17,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.16.svn%{?svn}%{?dist}
+Release: 0.17.svn%{?svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -331,6 +331,9 @@
%changelog
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.17.svn20110923
+- Update gpac-soname.patch
+
* Fri Sep 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.16svn20110923
- Update to 20110923
- Fix svnversion
gpac-0.4.6_15-soname.patch:
Makefile | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
Index: gpac-0.4.6_15-soname.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.6_15-soname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.6_15-soname.patch 22 Sep 2011 21:12:14 -0000 1.1
+++ gpac-0.4.6_15-soname.patch 3 Oct 2011 20:29:28 -0000 1.2
@@ -1,7 +1,7 @@
diff -up gpac/src/Makefile.soname gpac/src/Makefile
---- gpac/src/Makefile.soname 2011-09-22 22:52:41.453724213 +0200
-+++ gpac/src/Makefile 2011-09-22 22:56:31.621576300 +0200
-@@ -158,12 +158,17 @@ endif
+--- gpac/src/Makefile.soname 2011-07-01 17:38:17.000000000 +0200
++++ gpac/src/Makefile 2011-10-03 22:25:32.362122207 +0200
+@@ -158,17 +158,19 @@ endif
##libgpac library output
@@ -9,19 +9,22 @@
+LIBGPAC=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC_SOVERSION=".0"
+LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION)
-+LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
ifeq ($(CONFIG_WIN32),yes)
#LDFLAGS+=-export-symbols libgpac.def
-+LD_SONAME=
else
ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
+LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC)
-+LD_SONAME=
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
endif
-@@ -181,7 +186,7 @@ SRCS := $(OBJS:.o=.c)
+
+-LD_SONAME="-Wl,-soname,$(LIB)"
++LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
+ ifeq ($(CONFIG_DARWIN), yes)
+ LD_SONAME=
+ endif
+@@ -181,7 +183,7 @@ SRCS := $(OBJS:.o=.c)
all: lib
@@ -30,7 +33,7 @@
#there's a bunch of warnings in there, get rid of them
mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
-@@ -200,7 +205,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
+@@ -200,7 +202,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
$(CC) $(CFLAGS) -c -o $@ $<
@@ -39,7 +42,7 @@
ifeq ($(CONFIG_DARWIN),yes)
libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
ranlib ../bin/gcc/libgpac_static.a
-@@ -218,7 +223,7 @@ depend:
+@@ -218,7 +220,7 @@ depend:
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
clean: