[SCM] FFmpeg packaging branch, ubuntu.lucid, updated. debian/0.5+svn20090706-2ubuntu5.ppa1

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.lucid branch:
commit 7b8f3eb79ccbf249348cac2f303dc9be02e4d5c5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 15:00:51 2010 +0100

    enable symbol versioning
    
    this is submitted preversion of the symbol versioning patch that is
    currently not applied yet. The current form does not consider non-gnu
    linkers yet. However on Linux, we don't support other linkers anyways.
    This way we can start the symbol versioning transition earlier.

diff --git a/debian/patches/enable-versioning.patch b/debian/patches/enable-versioning.patch
new file mode 100644
index 0000000..241b328
--- /dev/null
+++ b/debian/patches/enable-versioning.patch
@@ -0,0 +1,95 @@
+Index: ffmpeg/common.mak
+===================================================================
+--- ffmpeg.orig/common.mak	2010-01-01 18:57:45.000000000 +0000
++++ ffmpeg/common.mak	2010-01-01 18:57:51.000000000 +0000
+@@ -77,7 +77,7 @@
+ DEPS := $(OBJS:.o=.d)
+ depend dep: $(DEPS)
+ 
+-CLEANSUFFIXES = *.o *~ *.ho
++CLEANSUFFIXES = *.o *~ *.ho *.ver
+ LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
+ DISTCLEANSUFFIXES = *.d *.pc
+ 
+Index: ffmpeg/libavcodec/libavcodec.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libavcodec/libavcodec.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,3 @@
++LIBAVCODEC_%MAJOR% {
++	global: *;
++};
+Index: ffmpeg/libavdevice/libavdevice.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libavdevice/libavdevice.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,4 @@
++LIBAVDEVICE_%MAJOR% {
++	global: avdevice_*;
++	local: *;
++};
+Index: ffmpeg/libavfilter/libavfilter.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libavfilter/libavfilter.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,4 @@
++LIBAVFILTER_%MAJOR% {
++	global: avfilter_*; av_*;
++	local: *;
++};
+Index: ffmpeg/libavformat/libavformat.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libavformat/libavformat.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,3 @@
++LIBAVFORMAT_%MAJOR% {
++	global: *;
++};
+Index: ffmpeg/libavutil/libavutil.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libavutil/libavutil.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,4 @@
++LIBAVUTIL_%MAJOR% {
++	global: av_*; ff_*; avutil_*;
++	local: *;
++};
+Index: ffmpeg/libpostproc/libpostproc.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libpostproc/libpostproc.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,4 @@
++LIBPOSTPROC_%MAJOR% {
++	global: postproc_*; pp_*;
++	local: *;
++};
+Index: ffmpeg/libswscale/libswscale.v
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg/libswscale/libswscale.v	2010-01-01 18:57:51.000000000 +0000
+@@ -0,0 +1,4 @@
++LIBSWSCALE_%MAJOR% {
++	global: swscale_*; sws_*; ff_*;
++	local: *;
++};
+Index: ffmpeg/subdir.mak
+===================================================================
+--- ffmpeg.orig/subdir.mak	2010-01-01 18:57:45.000000000 +0000
++++ ffmpeg/subdir.mak	2010-01-01 19:00:26.000000000 +0000
+@@ -27,9 +27,14 @@
+ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
+ 	cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
+ 
+-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
++$(SUBDIR)lib$(NAME).ver: $(SRC_PATH_BARE)/$(SUBDIR)lib$(NAME).v
++	sed 's/%MAJOR%/$(lib$(NAME)_VERSION_MAJOR)/' $$^ > $$@
++
++$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(SUBDIR)lib$(NAME).ver $(OBJS)
+ 	$(SLIB_CREATE_DEF_CMD)
+-	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter-out $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
++	$(CC) $(SHFLAGS) $(FFLDFLAGS) \
++		-Wl,--version-script,$(SUBDIR)lib$(NAME).ver \
++		-o $$@ $$(filter-out $(SUBDIR)lib$(NAME).ver $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
+ 	$(SLIB_EXTRA_CMD)
+ 
+ ifdef SUBDIR
diff --git a/debian/patches/series b/debian/patches/series
index 30114de..d9c3362 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ fix-dv-seeking.patch
 fix-constant-quant-encoding.patch
 increase-VOFW-on-x86.patch
 issue1245.patch
+enable-versioning.patch
 900_doxyfile
 # fpic-ftbfs-fix.patch
 # fpic-libpostproc-fix.patch

-- 
FFmpeg packaging