From 23db8ff6367bc28c224de0b8667381a2ee572877 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 30 Jul 2010 13:55:02 +0000 Subject: testing/vlc: moved from unstable builds atleast --- unstable/vlc/APKBUILD | 90 ----------------------------------------------- unstable/vlc/uclibc.patch | 65 ---------------------------------- 2 files changed, 155 deletions(-) delete mode 100644 unstable/vlc/APKBUILD delete mode 100644 unstable/vlc/uclibc.patch (limited to 'unstable') diff --git a/unstable/vlc/APKBUILD b/unstable/vlc/APKBUILD deleted file mode 100644 index d28ddf074..000000000 --- a/unstable/vlc/APKBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=vlc -pkgver=1.0.0 -pkgrel=0 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -url="http://www.videolan.org/vlc/" -license="GPL-2" -subpackages="$pkgname-dev $pkgname-doc" -#depends="libnotify a52dec fluidsynth zvbi libdvbpsi lirc-utils libdca hal -# libproxy sdl_image libdvdnav>=4.1.3 lua libxv libv4l libcddb smbclient -# libmatroska taglib sysfsutils libmpcdec ffmpeg>=0.5 libshout libmad -# qt fribidi libmpeg2 libmodplug avahi ttf-dejavu" -depends="ttf-dejavu" -makedepends=" - a52dec-dev - alsa-lib-dev - dbus-dev - ffmpeg-dev - fribidi-dev - gtk+-dev - libgcrypt-dev - libice-dev - libiconv-dev - libmad-dev - libmpeg2-dev - libnotify-dev - libogg-dev - libsm-dev - libx11-dev - libxext-dev - libxv-dev - lua-dev - mesa-dev - pkgconfig - sdl-dev - sysfsutils-dev - x264-dev - " -source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 - uclibc.patch - " - -build () -{ - cd "$srcdir"/$pkgname-$pkgver - sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c - - patch -p1 < ../uclibc.patch || return 1 - export CFLAGS="$CFLAGS -D_GNU_SOURCE" - - ./configure --prefix=/usr \ - --disable-mmx \ - --disable-nls \ - --disable-optimizations \ - --disable-qt4 --disable-skins2 \ - --disable-rpath \ - --enable-httpd \ - --enable-realrtsp \ - --enable-sout \ - --enable-vlm \ - || return 1 - -# --enable-dvdread \ -# --enable-dvdnav \ -# --enable-qt4 \ -# --enable-faad \ -# --enable-skins2 \ -# --enable-dvb \ -# --enable-v4l \ -# --enable-theora \ -# --enable-flac \ -# --enable-snapshot \ -# --enable-hal \ -# --enable-dbus \ -# --enable-dbus-control \ -# --enable-lirc \ -# --enable-shout \ -# --enable-pvr \ - - make || return 1 - make DESTDIR="$pkgdir"/ install || return 1 - for res in 16 32 48 128; do - install -D -m644 share/vlc${res}x${res}.png \ - "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1 - done - rm -rf "$pkgdir"/usr/lib/mozilla -} - -md5sums="fc78904ab5fa73f518d8fe4e852e7f67 vlc-1.0.0.tar.bz2 -2a16bf6c14a94f41490872aa189db755 uclibc.patch" diff --git a/unstable/vlc/uclibc.patch b/unstable/vlc/uclibc.patch deleted file mode 100644 index f71b189a4..000000000 --- a/unstable/vlc/uclibc.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/src/misc/linux_specific.c 2009-07-08 09:29:41.000000000 +0000 -+++ b/src/misc/linux_specific.c 2009-07-08 09:30:47.000000000 +0000 -@@ -72,14 +72,14 @@ - } - #endif - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - # include - # include - #endif - - void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) - { --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - const char *glcv = gnu_get_libc_version (); - - /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing, ---- a/src/control/vlm.c 2009-07-09 09:21:55.000000000 +0000 -+++ b/src/control/vlm.c 2009-07-09 09:22:24.000000000 +0000 -@@ -21,6 +21,10 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include - #include - #include ---- a/src/misc/mtime.c 2009-07-09 11:57:46.000000000 +0000 -+++ b/src/misc/mtime.c 2009-07-09 13:48:16.000000000 +0000 -@@ -78,7 +78,7 @@ - # define _POSIX_CLOCK_SELECTION (-1) - #endif - --# if (_POSIX_CLOCK_SELECTION < 0) -+# if (_POSIX_CLOCK_SELECTION < 0) || defined(__UCLIBC__) - /* - * We cannot use the monotonic clock is clock selection is not available, - * as it would screw vlc_cond_timedwait() completely. Instead, we have to ---- a/src/misc/threads.c 2009-07-09 13:54:08.000000000 +0000 -+++ b/src/misc/threads.c 2009-07-09 13:54:32.000000000 +0000 -@@ -474,7 +474,7 @@ - /* Fairly outdated POSIX support (that was defined in 2001) */ - # define _POSIX_CLOCK_SELECTION (-1) - # endif --# if (_POSIX_CLOCK_SELECTION >= 0) -+# if (_POSIX_CLOCK_SELECTION >= 0) && !defined(__UCLIBC__) - /* NOTE: This must be the same clock as the one in mtime.c */ - pthread_condattr_setclock (&attr, CLOCK_MONOTONIC); - # endif ---- a/modules/stream_filter/decomp.c 2009-07-09 14:10:09.000000000 +0000 -+++ b/modules/stream_filter/decomp.c 2009-07-09 14:11:37.000000000 +0000 -@@ -28,7 +28,7 @@ - #include - #include - #include --#ifndef _POSIX_SPAWN -+#if !defined(_POSIX_SPAWN) || defined(__UCLIBC__) - # define _POSIX_SPAWN (-1) - #endif - #include -- cgit v1.2.3