r1131 - in /experimental/ffmpeg/debian: changelog control rules

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Thu Apr 17 07:58:57 2008
New Revision: 1131

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1131
Log:
* debian/control:
+ Added libx11-dev and libxext-dev to Build-Depends.
* debian/rules:
+ Build with --enable-x11grab (Closes: #441983).
+ Build ffmpeg and shared libraries with --extra-cflags="-fPIC -DPIC"
(feeling confident that this closes: #472613).


Modified:
    experimental/ffmpeg/debian/changelog
    experimental/ffmpeg/debian/control
    experimental/ffmpeg/debian/rules

Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=1131&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Thu Apr 17 07:58:57 2008
@@ -1,11 +1,20 @@
 ffmpeg-free (0.svn20080206-2) UNRELEASED; urgency=low
 
+  [ Reinhard Tartler ]
   * patches/020_fix_sws_scale_crash: if sws_scale is given an invalid context
     (e.g. a null pointer), the function will crash because of a null pointer
     dereference. Add a check for that here.
   * add Conflicts/Replaces for libswscale1d.
 
- -- Reinhard Tartler <siretart at tauware.de>  Fri, 21 Mar 2008 20:38:00 +0100
+  [ Fabian Greffrath ]
+  * debian/control:
+    + Added libx11-dev and libxext-dev to Build-Depends.
+  * debian/rules:
+    + Build with --enable-x11grab (Closes: #441983).
+    + Build ffmpeg and shared libraries with --extra-cflags="-fPIC -DPIC"
+      (feeling confident that this closes: #472613).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 17 Apr 2008 09:57:00 +0100
 
 ffmpeg-free (0.svn20080206-1) experimental; urgency=low
 

Modified: experimental/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/control?rev=1131&op=diff
==============================================================================
--- experimental/ffmpeg/debian/control (original)
+++ experimental/ffmpeg/debian/control Thu Apr 17 07:58:57 2008
@@ -17,6 +17,8 @@
                libsdl1.2-dev,
                libtheora-dev (>> 0.0.0.alpha4),
                libvorbis-dev,
+               libx11-dev,
+               libxext-dev,
                quilt,
                texi2html,
                zlib1g-dev

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=1131&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Thu Apr 17 07:58:57 2008
@@ -6,7 +6,7 @@
 
 LIBS = libavutil libavcodec libpostproc libavformat libavdevice libswscale
 # Comment out the following single line for LGPL versions of the libraries
-confflags += --enable-gpl --enable-liba52 --enable-libfaad --enable-pp --enable-swscaler
+confflags += --enable-gpl --enable-liba52 --enable-libfaad --enable-pp --enable-swscaler --enable-x11grab
 confflags += --enable-pthreads
 confflags += --enable-libvorbis --enable-libtheora
 confflags += --enable-libgsm
@@ -69,7 +69,7 @@
 	for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
 
 	# Build ffmpeg and shared libraries
-	./configure $(confflags) --enable-shared --prefix=/usr
+	./configure $(confflags) --enable-shared --prefix=/usr --extra-cflags="-fPIC -DPIC"
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif