* New Debian upload. Uses newer x264 and faad snapshots.

diff --git a/debian/Makefile.am b/debian/Makefile.am
index f1bcb55e88c8b71466832cd8f31de67fb7a88983..fc65b2059e0343c5dff3f9c433af2f9cbe0815ea 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -30,5 +30,7 @@ EXTRA_DIST = \
        wxvlc.dirs \
        wxvlc.menu \
        patches/00list \
+       patches/20_osdmenu-paths.dpatch \
        patches/20_no-wx-updates.dpatch \
+       gcc-snapshot \
        $(NULL)

diff --git a/debian/changelog b/debian/changelog
index f2b397df56aafcaae06ab7d6354f848a171ea2df..84a1f549ce2ac53b7d8e0dde3dc715a8a49b5b57 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+vlc (0.8.4-svn20050920-1) unstable; urgency=low
+
+  * New SVN snapshot.
+  * configure.ac:
+    + Upstream fixed the AltiVec build on PPC.
+  * debian/control:
+    + Build-depend on a newer version of libavcodec. mp2v and mp1v encoders
+      work again (Closes: #324840).
+    + Build-depend on gcc-snapshot on i386 and amd64, because currently only
+      that version of gcc properly builds some of the MMX modules.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 20 Sep 2005 13:43:41 +0200
+
+vlc (0.8.4-svn20050823-2) unstable; urgency=low
+
+  * debian/control:
+    + Build-depend on libflac-dev (>= 1.1.2-3) because of the soname
+      change (Closes: #325948).
+  * debian/copyright:
+    + Fixed the FSF address.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Thu,  1 Sep 2005 12:36:10 +0200
+
 vlc (0.8.4-svn20050823-1) unstable; urgency=low
 
   * New SVN snapshot.

diff --git a/debian/control b/debian/control
index 3da36450dd10eafbae99e981d13b2636d96493ef..262f83a67778abfa10467be78151737aba1b61e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev (>= 1.4.2-1), libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev (>= 2:1.7.10-1), libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.1-5), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls11-dev, libavcodec-dev (>= 0.cvs20050811-2), libavformat-dev (>= 0.cvs20050811-2), libpostproc-dev (>= 0.cvs20050811-2), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev, libsmbclient-dev
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev (>= 1.4.2-1), libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev (>= 2:1.7.10-1), libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.2-3), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls11-dev, libavcodec-dev (>= 0.cvs20050918-2), libavformat-dev (>= 0.cvs20050918-2), libpostproc-dev (>= 0.cvs20050918-2), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev, libsmbclient-dev, gcc-snapshot [i386 amd64]
 Standards-Version: 3.6.2.1
 
 Package: vlc

diff --git a/debian/gcc-snapshot b/debian/gcc-snapshot
new file mode 100755 (executable)
index 0000000..5de7f9c
--- /dev/null
+++ b/debian/gcc-snapshot
@@ -0,0 +1,4 @@
+#! /bin/sh
+LD_LIBRARY_PATH=/usr/lib/gcc-snapshot/lib:$LD_LIBRARY_PATH
+PATH=/usr/lib/gcc-snapshot/bin:$PATH
+gcc "$@"

diff --git a/debian/rules b/debian/rules
index 740c37abf7aa4c4078b723ecec53c65f6962f32f..c51e9a5a0210dd99f1c5ae5124429c5518bd6e39 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,16 @@ CONFIG_FLAGS += --enable-glide
 CONFIG_FLAGS += --enable-svgalib
 endif
 
+# We need this hack for i386 and amd64
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
+CC = $(shell pwd)/debian/gcc-snapshot
+export CC
+endif
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),amd64)
+CC = $(shell pwd)/debian/gcc-snapshot
+export CC
+endif
+
 # Remove --without-dvdcss in non-totalitarian countries
 CONFIG_FLAGS += --enable-dvd --without-dvdcss
 
@@ -83,6 +93,7 @@ VIDDIR = usr/share/vlc
 PIXDIR = usr/share/pixmaps
 APPDIR = usr/share/applications
 
+
 #
 # Build rules
 #
@@ -102,7 +113,8 @@ configure-stamp:
        test -d extras/x264
        if test ! '(' -d CVS -o -d .svn ')'; then \
          cd extras/x264 \
-         && jam -dx libx264.a; \
+         && ./configure --extra-cflags='$$(ECFLAGS)' \
+         && $(MAKE); \
        fi
 
        # Check that we have an faad2 tree in here (can be a symlink)
@@ -137,11 +149,8 @@ build-stamp: patch configure-stamp
        # Hackety hackety hack
        if test ! '(' -d CVS -o -d .svn ')'; then \
          cd extras/x264 \
-         && jam -dx clean \
-         && rm -f Jamfile.pic \
-         && sed 's/^CCFLAGS *=/& -fPIC -DPIC /' <Jamfile >Jamfile.pic \
-         && jam -dx -sJAMFILE=Jamfile.pic libx264.a \
-         && rm -f Jamfile.pic; \
+         && $(MAKE) clean \
+         && $(MAKE) ECFLAGS=-fPIC; \
        fi
 
        # HACKETY HACKETY HACK
@@ -164,7 +173,7 @@ clean: unpatch
        # Check that we have an x264 tree in here (can be a symlink)
        test -d extras/x264
        -if test ! '(' -d CVS -o -d .svn ')'; then \
-         cd extras/x264 && jam -dx clean; \
+         cd extras/x264 && $(MAKE) distclean; \
        fi
        # Check that we have an faad2 tree in here (can be a symlink)
        test -d extras/faad2