r786 - in /unstable/vlc/debian: changelog control patches/108_flac-1.1.3.diff patches/series rules vlc-nox.install
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Wed Jun 6 22:57:30 UTC 2007
Author: xtophe-guest
Date: Wed Jun 6 22:57:30 2007
New Revision: 786
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=786
Log:
New patch to build with flac 1.1.3
Disable x264
Added:
unstable/vlc/debian/patches/108_flac-1.1.3.diff
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/control
unstable/vlc/debian/patches/series
unstable/vlc/debian/rules
unstable/vlc/debian/vlc-nox.install
Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=786&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Wed Jun 6 22:57:30 2007
@@ -1,9 +1,16 @@
vlc (0.8.6.a.debian-7) UNRELEASED; urgency=low
+ [ Loic Minier ]
* New patch, 107_gcc-4.3, fixes missing include causing a build failure with
GCC 4.3; thanks Martin Michlmayr; closes: #417750.
- -- Loic Minier <lool at dooz.org> Wed, 04 Apr 2007 16:11:23 +0200
+ [ Christophe Mutricy ]
+ * No longer build the x264 module as libx264 has been removed from Sid
+ (Closes: #424649, #427283).
+ * New patch, 108_flac-1.1.3 taken from upstream to fix building with
+ libflac8 (Closes: #426673).
+ * Rebuild against new libavcodec and libavformat (Closes: #427573).
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 28 May 2007 21:59:45 +0100
vlc (0.8.6.a.debian-6) unstable; urgency=low
Modified: unstable/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/control?rev=786&op=diff
==============================================================================
--- unstable/vlc/debian/control (original)
+++ unstable/vlc/debian/control Wed Jun 6 22:57:30 2007
@@ -2,8 +2,8 @@
Section: graphics
Priority: optional
Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Clément Stenac <zorglub at debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev, libx264-dev, libfaad-dev
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Clément Stenac <zorglub at debian.org>, Loic Minier <lool at dooz.org>, Christophe Mutricy <xtophe at videolan.org>
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev, libfaad-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/vlc
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/
Added: unstable/vlc/debian/patches/108_flac-1.1.3.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/108_flac-1.1.3.diff?rev=786&op=file
==============================================================================
--- unstable/vlc/debian/patches/108_flac-1.1.3.diff (added)
+++ unstable/vlc/debian/patches/108_flac-1.1.3.diff Wed Jun 6 22:57:30 2007
@@ -1,0 +1,136 @@
+# Taken from https://trac.videolan.org/vlc/changeset/18855
+
+Index: vlc-0.8.6.a.debian/modules/codec/flac.c
+===================================================================
+--- vlc-0.8.6.a.debian/modules/codec/flac.c (revision 18854)
++++ vlc-0.8.6.a.debian/modules/codec/flac.c (revision 18855)
+@@ -41,6 +41,10 @@
+
+ #define MAX_FLAC_HEADER_SIZE 16
+
++#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT >= 8
++# define USE_NEW_FLAC_API
++#endif
++
+ /*****************************************************************************
+ * decoder_sys_t : FLAC decoder descriptor
+ *****************************************************************************/
+@@ -226,6 +230,25 @@
+ return VLC_EGENERIC;
+ }
+
++#ifdef USE_NEW_FLAC_API
++ if( FLAC__stream_decoder_init_stream( p_sys->p_flac,
++ DecoderReadCallback,
++ NULL,
++ NULL,
++ NULL,
++ NULL,
++ DecoderWriteCallback,
++ DecoderMetadataCallback,
++ DecoderErrorCallback,
++ p_dec )
++ != FLAC__STREAM_DECODER_INIT_STATUS_OK )
++ {
++ msg_Err( p_dec, "FLAC__stream_decoder_init_stream() failed" );
++ FLAC__stream_decoder_delete( p_sys->p_flac );
++ free( p_sys );
++ return VLC_EGENERIC;
++ }
++#else
+ FLAC__stream_decoder_set_read_callback( p_sys->p_flac,
+ DecoderReadCallback );
+ FLAC__stream_decoder_set_write_callback( p_sys->p_flac,
+@@ -238,6 +261,7 @@
+
+ FLAC__stream_decoder_init( p_sys->p_flac );
+ #endif
++#endif
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+@@ -731,16 +755,27 @@
+ case FLAC__STREAM_DECODER_END_OF_STREAM:
+ msg_Dbg( p_dec, "the decoder has reached the end of the stream." );
+ break;
++#ifdef USE_NEW_FLAC_API
++ case FLAC__STREAM_DECODER_OGG_ERROR:
++ msg_Err( p_dec, "error occurred in the Ogg layer." );
++ break;
++ case FLAC__STREAM_DECODER_SEEK_ERROR:
++ msg_Err( p_dec, "error occurred while seeking." );
++ break;
++#endif
+ case FLAC__STREAM_DECODER_ABORTED:
+ msg_Warn( p_dec, "the decoder was aborted by the read callback." );
+ break;
++#ifndef USE_NEW_FLAC_API
+ case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
+ msg_Warn( p_dec, "the decoder encountered reserved fields in use "
+ "in the stream." );
+ break;
++#endif
+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
+ msg_Err( p_dec, "error when allocating memory." );
+ break;
++#ifndef USE_NEW_FLAC_API
+ case FLAC__STREAM_DECODER_ALREADY_INITIALIZED:
+ msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the "
+ "decoder was already initialized, usually because "
+@@ -750,6 +785,7 @@
+ msg_Err( p_dec, "FLAC__stream_decoder_init() was called without "
+ "all callbacks being set." );
+ break;
++#endif
+ case FLAC__STREAM_DECODER_UNINITIALIZED:
+ msg_Err( p_dec, "decoder in uninitialized state." );
+ break;
+@@ -1184,7 +1220,12 @@
+ p_sys->i_samples_delay = 0;
+
+ /* Create flac encoder */
+- p_sys->p_flac = FLAC__stream_encoder_new();
++ if( !(p_sys->p_flac = FLAC__stream_encoder_new()) )
++ {
++ msg_Err( p_enc, "FLAC__stream_encoder_new() failed" );
++ free( p_sys );
++ return VLC_EGENERIC;
++ }
+
+ FLAC__stream_encoder_set_streamable_subset( p_sys->p_flac, 1 );
+ FLAC__stream_encoder_set_channels( p_sys->p_flac,
+@@ -1194,15 +1235,32 @@
+ FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 );
+ p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
+
++ /* Get and store the STREAMINFO metadata block as a p_extra */
++ p_sys->p_chain = 0;
++
++#ifdef USE_NEW_FLAC_API
++ if( FLAC__stream_encoder_init_stream( p_sys->p_flac,
++ EncoderWriteCallback,
++ NULL,
++ NULL,
++ EncoderMetadataCallback,
++ p_enc )
++ != FLAC__STREAM_ENCODER_INIT_STATUS_OK )
++ {
++ msg_Err( p_enc, "FLAC__stream_encoder_init_stream() failed" );
++ FLAC__stream_encoder_delete( p_sys->p_flac );
++ free( p_sys );
++ return VLC_EGENERIC;
++ }
++#else
+ FLAC__stream_encoder_set_write_callback( p_sys->p_flac,
+ EncoderWriteCallback );
+ FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac,
+ EncoderMetadataCallback );
+ FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc );
+
+- /* Get and store the STREAMINFO metadata block as a p_extra */
+- p_sys->p_chain = 0;
+ FLAC__stream_encoder_init( p_sys->p_flac );
++#endif
+
+ return VLC_SUCCESS;
+ }
Modified: unstable/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/series?rev=786&op=diff
==============================================================================
--- unstable/vlc/debian/patches/series (original)
+++ unstable/vlc/debian/patches/series Wed Jun 6 22:57:30 2007
@@ -8,5 +8,6 @@
105_audio_format_crash.diff
106_xshm_check.diff
107_gcc-4.3.diff
+108_flac-1.1.3.diff
200_osdmenu_paths.diff
300_manpage_syntax.diff
Modified: unstable/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/rules?rev=786&op=diff
==============================================================================
--- unstable/vlc/debian/rules (original)
+++ unstable/vlc/debian/rules Wed Jun 6 22:57:30 2007
@@ -75,7 +75,6 @@
--enable-notify \
--enable-faad \
--enable-mediacontrol-bindings \
- --enable-x264 \
$(NULL)
# These ones are only for Linux
Modified: unstable/vlc/debian/vlc-nox.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/vlc-nox.install?rev=786&op=diff
==============================================================================
--- unstable/vlc/debian/vlc-nox.install (original)
+++ unstable/vlc/debian/vlc-nox.install Wed Jun 6 22:57:30 2007
@@ -42,7 +42,6 @@
usr/lib/vlc/codec/libcvdsub_plugin.so
usr/lib/vlc/codec/libfake_plugin.so
usr/lib/vlc/codec/libfaad_plugin.so
-usr/lib/vlc/codec/libx264_plugin.so
usr/lib/vlc/control
usr/lib/vlc/demux
usr/lib/vlc/gui/libncurses_plugin.so
More information about the pkg-multimedia-commits
mailing list