main/vlc: use live-media package and remove livemedia

duplicate.

2 files changed, 2 insertions, 39 deletions

diff --git a/main/livemedia/APKBUILD b/main/livemedia/APKBUILD
deleted file mode 100644
index d974c63ee1..0000000000
--- a/main/livemedia/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=livemedia
-pkgver=2010.11.17
-pkgrel=0
-pkgdesc="multimedia RTSP streaming library"
-url="http://live555.com/liveMedia/"
-license="LGPL"
-depends=
-makedepends="g++"
-install=
-subpackages=""
-source="http://live555.com/liveMedia/public/live.$pkgver.tar.gz"
-
-_builddir="$srcdir"/live
-prepare() {
-        cd "$_builddir"
-}
-
-build() {
-        cd "$_builddir"
-        sed -i -e "/^COMPILE_OPTS/s/$/ -fPIC -DPIC/" config.linux
-        ./genMakefiles linux
-        make || return 1
-}
-
-package() {
-        cd "$_builddir"
-        mkdir -p "$pkgdir"/usr/lib
-        for f in BasicUsageEnvironment UsageEnvironment liveMedia groupsock; do
-                mkdir -p "$pkgdir"/usr/include/$f
-                cp $f/include/*.h* "$pkgdir"/usr/include/$f
-                cp $f/lib${f}.a "$pkgdir"/usr/lib
-        done
-}
-
-md5sums="f08e00a18bf4cd5058e05a869b934d4e  live.2010.11.17.tar.gz"
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 151b7c9b4b..54d4f64404 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlc
 pkgver=1.1.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 url="http://www.videolan.org/vlc/"
 license="GPL-2"
@@ -42,7 +42,7 @@ makedepends="
         sdl-dev
         sysfsutils-dev
         x264-dev
-        livemedia
+        live-media-dev
         "
 source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
         uclibc3.patch