From a8d803ef557c40102c01dc11c0f21b99534c5841 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 6 Feb 2010 19:01:55 +0100 Subject: vlc, maj des dépendances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extra/vlc/Pkgfile | 2 +- extra/vlc/build.2007 | 84 ------------------------------------- extra/vlc/build.2008 | 93 ----------------------------------------- extra/vlc/ffmpeg-20071204.patch | 14 ------- extra/vlc/vlc-0.8.5.patch | 15 ------- 5 files changed, 1 insertion(+), 207 deletions(-) delete mode 100644 extra/vlc/build.2007 delete mode 100644 extra/vlc/build.2008 delete mode 100644 extra/vlc/ffmpeg-20071204.patch delete mode 100644 extra/vlc/vlc-0.8.5.patch (limited to 'extra') diff --git a/extra/vlc/Pkgfile b/extra/vlc/Pkgfile index b1b9ac212..49f4f45e8 100644 --- a/extra/vlc/Pkgfile +++ b/extra/vlc/Pkgfile @@ -2,7 +2,7 @@ # URL: http://www.videolan.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: ffmpeg, flac, freetype, fribidi, goom, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, lame, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, sdl_image, qt, libnotify +# Depends on: ffmpeg, flac, freetype, fribidi, goom, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, lame, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, sdl_image, qt, libnotify, libmpcdec, hal, taglib, samba3 name=vlc version=1.0.5 diff --git a/extra/vlc/build.2007 b/extra/vlc/build.2007 deleted file mode 100644 index 751bf82f6..000000000 --- a/extra/vlc/build.2007 +++ /dev/null @@ -1,84 +0,0 @@ -# Description: Lecteur multimedia -# URL: http://www.videolan.org/ -# Maintainer: Thierry Nuttens, thierryn1 at hispeed dot ch -# Depends on: liba52, faac, faad2, ffmpeg, flac, freetype, fribidi, goom, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, lame, vcdimager, wxwidget, x264, zlib, aalib, libcaca, libmpeg2, libdaap, libmp4v2 - -name=vlc -version=0.8.6d -release=2 -group=app -_ffmpegver=20071204 -source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.gz\ - http://gerolde.archlinux.org/~paul/ffmpeg-$_ffmpegver.tar.gz\ - ffmpeg-20071204.patch) - -build() { - cd ffmpeg - ./configure \ - --enable-gpl \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-pp \ - --enable-libfaac \ - --enable-libfaad \ - --enable-liba52 \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libtheora \ - --disable-libamr-nb \ - --enable-pp \ - --enable-shared \ - --enable-pthreads \ - --enable-x11grab - - # build - make -j3 - - cd ../$name-$version - patch -Np1 < ../ffmpeg-20071204.patch - sed -i -e 's:#include :#include \n #include : ' src/misc/charset.c - sed -i -e 's:/truetype/freefont/FreeSerifBold.ttf:/TTF/VeraBd.ttf:' modules/misc/freetype.c - - # export linker flags for the ffmpeg tree - # this has to be in sync with how ffmpeg was configured above - export LDFLAGS_ffmpeg="-lfaad -la52 -lxvidcore -lmp3lame -lx264" - -# patch -p1 < ../$name-$version.patch - ./configure --prefix=/usr \ - --enable-dvdread \ - --enable-dvdnav \ - --enable-madi \ - --enable-ffmpeg \ - --disable-rpath \ - --enable-wxwidgets \ - --enable-faad \ - --enable-alsa \ - --enable-livedotcom \ - --enable-dvb \ - --enable-theora \ - --enable-dmo \ - --with-livedotcom-tree=/usr/lib/live \ - --with-ffmpeg-faac \ - --with-ffmpeg-vorbis \ - --with-ffmpeg-dts \ - --with-ffmpeg-ogg \ - --with-ffmpeg-theora \ - --with-ffmpeg-tree=../ffmpeg/ \ - --with-ffmpeg-config-path=../ffmpeg/ \ - --enable-v4l \ - --enable-lirc \ - --enable-loader - -# patch -Np1 -i ../ffmpeg-20071204.patch - - make -j3 - make DESTDIR=$PKG install - - for res in 16 32 48; do - install -D -m644 share/vlc${res}x${res}.png \ - $PKG/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1 - done - - rm -rf $PKG/usr/lib/mozilla -} - diff --git a/extra/vlc/build.2008 b/extra/vlc/build.2008 deleted file mode 100644 index a710a63c4..000000000 --- a/extra/vlc/build.2008 +++ /dev/null @@ -1,93 +0,0 @@ -# Description: Lecteur multimedia -# URL: http://www.videolan.org/ -# Maintainer: NuTyX core team -# Packager: thierryn1 at hispeed dot ch -# Depends on: ffmpeg, flac, freetype, fribidi, goom, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, lame, vcdimager, x264, zlib, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, sdl_image, qt4, libnotify - -name=vlc -version=0.9.8a -release=2 -group=app -_ffmpegver=r15976 -source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.bz2\ - http://kiao.no-ip.info/files/ffmpeg-${_ffmpegver}.tar.gz\ - ffmpeg-20071204.patch) - -build() { - cd ffmpeg-${_ffmpegver} - ./configure \ - --enable-gpl \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-pp \ - --enable-libfaac \ - --enable-libfaad \ - --enable-liba52 \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libtheora \ - --disable-libamr-nb \ - --enable-pp \ - --enable-shared \ - --enable-pthreads \ - --enable-x11grab - - # build - make -j3 - cd .. - - cd $name-$version -# patch -Np1 < ../ffmpeg-20071204.patch -# sed -i -e 's:#include :#include \n #include : ' modules/misc/freetype.c -sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSans-Bold.ttf:' modules/misc/freetype.c -export LDFLAGS_ffmpeg="-lfaad -la52 -lxvidcore -lmp3lame -lx264" - ./configure --prefix=/usr \ - --enable-dvdread \ - --enable-dvdnav \ - --enable-madi \ - --disable-pulse \ - --enable-ffmpeg \ - --disable-rpath \ - --enable-wxwidget \ - --enable-faad \ - --enable-alsa \ - --enable-skins2 \ - --enable-dvb \ - --enable-dmo \ - --with-ffmpeg-faac \ - --with-ffmpeg-vorbis \ - --with-ffmpeg-dts \ - --with-ffmpeg-ogg \ - --with-ffmpeg-theora \ - --with-ffmpeg-tree=../ffmpeg/ \ - --with-ffmpeg-config-path=../ffmpeg/ \ - --enable-livedotcom \ - --enable-v4l \ - --enable-theora \ - --enable-snapshot \ - --enable-hal \ - --enable-dbus \ - --enable-ogg \ - --enable-dbus-control \ - --enable-shared \ - --enable-nls \ - --enable-lirc \ - --enable-shout \ - --enable-pvr \ - --enable-release \ - --program-suffix= \ - --with-dv-raw1394=/usr/include/libraw1394 \ - --enable-loader \ - --enable-live555 \ - --with-live555-tree=/usr/lib/live - make -j3 - make -j3 DESTDIR=$PKG install - - for res in 16 32 48; do - install -D -m644 share/vlc${res}x${res}.png \ - $PKG/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1 - done - - rm -rf $PKG/usr/lib/mozilla -} - diff --git a/extra/vlc/ffmpeg-20071204.patch b/extra/vlc/ffmpeg-20071204.patch deleted file mode 100644 index 97bf5d9f5..000000000 --- a/extra/vlc/ffmpeg-20071204.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/modules/codec/ffmpeg/mux.c -+++ b/modules/codec/ffmpeg/mux.c -@@ -133,7 +133,11 @@ int E_(OpenMux)( vlc_object_t *p_this ) - return VLC_EGENERIC; - } - -+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) -+ p_sys->oc->pb = &p_sys->io; -+#else - p_sys->oc->pb = p_sys->io; -+#endif - p_sys->oc->nb_streams = 0; - - p_sys->b_write_header = VLC_TRUE; diff --git a/extra/vlc/vlc-0.8.5.patch b/extra/vlc/vlc-0.8.5.patch deleted file mode 100644 index 320b2e42c..000000000 --- a/extra/vlc/vlc-0.8.5.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- vlc-0.8.5/modules/audio_output/portaudio.c 2006-05-11 13:15:36.000000000 +0200 -+++ vlc-0.8.5/modules/audio_output/portaudio.c-new 2006-05-11 13:16:27.000000000 +0200 -@@ -61,12 +61,10 @@ - { - aout_instance_t *p_aout; - PaStream *p_stream; -- - PaDeviceIndex i_devices; - int i_sample_size; - PaDeviceIndex i_device_id; - const PaDeviceInfo *deviceInfo; -- - vlc_bool_t b_chan_reorder; /* do we need channel reordering */ - int pi_chan_table[AOUT_CHAN_MAX]; - uint32_t i_channel_mask; -- cgit v1.2.3-54-g00ecf