aboutsummaryrefslogtreecommitdiffstats
path: root/main/vlc
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@gmail.com>2011-02-11 10:10:07 +0000
committerLeonardo Arena <rnalrd@gmail.com>2011-02-11 10:10:07 +0000
commit44a3b408b3b07a82ccef8323b34f918eb11d7563 (patch)
tree78d7db95450afaf03b563ace76fc236878f233f6 /main/vlc
parent71772db0b9abf4e45a207540847f71b961649d71 (diff)
downloadaports-44a3b408b3b07a82ccef8323b34f918eb11d7563.tar.bz2
aports-44a3b408b3b07a82ccef8323b34f918eb11d7563.tar.xz
main/vlc: vorbis and v4l support added
Diffstat (limited to 'main/vlc')
-rw-r--r--main/vlc/APKBUILD21
-rw-r--r--main/vlc/vlc-1.1.7-disable-cache-gen.patch12
2 files changed, 26 insertions, 7 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 648db00f3a..30f2b73fa2 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Leonardo Arena <rnalrd@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vlc
pkgver=1.1.7
-pkgrel=0
+pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
url="http://www.videolan.org/vlc/"
arch="all"
@@ -35,23 +36,26 @@ makedepends="
libogg-dev
libsm-dev
libtheora-dev
+ libvorbis-dev
libx11-dev
libxext-dev
libxv-dev
+ live-media-dev
lua-dev
ncurses-dev
mesa-dev
pkgconfig
sdl-dev
sysfsutils-dev
+ v4l-utils-dev
x264-dev
- live-media-dev
"
source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
uclibc3.patch
uclibc-libcompat.patch
uclibc-inhibit-spawn.patch
vlc.trigger
+ vlc-1.1.7-disable-cache-gen.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -74,7 +78,7 @@ build ()
cd "$_builddir"
sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
- export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ export CFLAGS="$CFLAGS -D_GNU_SOURCE -fPIC"
./configure --prefix=/usr \
--disable-mmx \
@@ -82,20 +86,23 @@ build ()
--disable-optimizations \
--disable-qt4 --disable-skins2 \
--disable-rpath \
+ --enable-a52 \
--enable-dbus \
--enable-dbus-control \
+ --enable-dvbpsi \
--enable-faad \
--enable-flac \
--enable-httpd \
+ --enable-live555 \
--enable-ncurses \
--enable-realrtsp \
--enable-sdl \
--enable-sout \
--enable-theora \
+ --enable-v4l \
--enable-vlm \
+ --enable-vorbis \
--enable-xvideo \
- --enable-live555 \
- --enable-dvbpsi \
|| return 1
# --enable-dvdread \
@@ -103,7 +110,6 @@ build ()
# --enable-qt4 \
# --enable-skins2 \
# --enable-dvb \
-# --enable-v4l \
# --enable-snapshot \
# --enable-hal \
# --enable-lirc \
@@ -152,4 +158,5 @@ md5sums="932ce1fa4afa54b56ac0ccc0655667b6 vlc-1.1.7.tar.bz2
4f74dcde9ce51c15d80c3876b85c05f2 uclibc3.patch
d718e22a7de9f38579f276f720b2f36a uclibc-libcompat.patch
43bea31edd02de2b53075e5e883706db uclibc-inhibit-spawn.patch
-ddbd40bd72fedc1449be45588aea5d66 vlc.trigger"
+ddbd40bd72fedc1449be45588aea5d66 vlc.trigger
+e1ef2dec8e25f7ea6ba40e646c63e061 vlc-1.1.7-disable-cache-gen.patch"
diff --git a/main/vlc/vlc-1.1.7-disable-cache-gen.patch b/main/vlc/vlc-1.1.7-disable-cache-gen.patch
new file mode 100644
index 0000000000..b8a3dd9551
--- /dev/null
+++ b/main/vlc/vlc-1.1.7-disable-cache-gen.patch
@@ -0,0 +1,12 @@
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -63,7 +63,8 @@
+
+ stamp-cache:
+ $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
+- ../bin/vlc-cache-gen$(EXEEXT) . ; \
++ # ../bin/vlc-cache-gen$(EXEEXT) . ; \
++ echo "FIXME: vlc-cache-gen" ; \
+ else \
+ echo "Cross-compilation: cache generation skipped!" ; \
+ fi