main/vlc: remove dlclose workaround

It appears to have been fixed in uclibc

3 files changed, 1 insertions, 46 deletions

diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 7ba7a19de3..94f4ac34a8 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=vlc
 pkgver=2.0.4
 _pkgver=${pkgver/_/-}
-pkgrel=0
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 pkgusers="vlc"
 pkggroups="vlc"
@@ -13,9 +13,6 @@ license="GPL-2"
 triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg
         $pkgname-daemon"
-#depends="fluidsynth zvbi lirc-utils libdca
-#       libproxy libcddb smbclient
-#       libmpcdec libmodplug"
 depends="ttf-dejavu"
 makedepends="
         a52dec-dev
@@ -74,11 +71,8 @@ source="http://download.videolan.org/pub/videolan/$pkgname/$_pkgver/$pkgname-$_p
         uclibc-inhibit-spawn.patch
         uclibc-no-xscreensaver.patch
         uclibc3.patch
-        vlc-dlclose-workaround.patch
         vlc.trigger
         "
-#       uclibc-libcompat.patch
-#       vlc-1.1.7-disable-cache-gen.patch
 
 _builddir="$srcdir"/$pkgname-$_pkgver
 prepare() {
@@ -145,12 +139,6 @@ build ()
                 --enable-xvideo \
                 || return 1
 
-#               --enable-dvb \
-#               --enable-snapshot \
-#               --enable-hal \
-#               --enable-lirc \
-#               --enable-pvr \
-
         make || return 1
 }
 
@@ -235,5 +223,4 @@ md5sums="f36dab8f126922c56b372388b7fade47  vlc-2.0.4.tar.xz
 28349b8239fdd6987fbe0ca2c758517f  uclibc-inhibit-spawn.patch
 b84c5a9121440b6a1dcf28792d783eb8  uclibc-no-xscreensaver.patch
 94f11ec8394775018222781a0c875444  uclibc3.patch
-5aa45c7966b915801a0e449f56b6c454  vlc-dlclose-workaround.patch
 350b30698eb784def7d19446eb1d6c81  vlc.trigger"
diff --git a/main/vlc/vlc-1.1.7-disable-cache-gen.patch b/main/vlc/vlc-1.1.7-disable-cache-gen.patch
deleted file mode 100644
index b8a3dd9551..0000000000
--- a/main/vlc/vlc-1.1.7-disable-cache-gen.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/main/vlc/vlc-dlclose-workaround.patch b/main/vlc/vlc-dlclose-workaround.patch
deleted file mode 100644
index 44001c8c84..0000000000
--- a/main/vlc/vlc-dlclose-workaround.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-We have an issue with dlclose on uclibc on x86_64.
-For now we work around it by simply not dlcose our plugins.
-
-
---- ./src/modules/bank.c.orig
-+++ ./src/modules/bank.c
-@@ -484,11 +484,13 @@
-     assert (module->next == NULL);
- 
-     /* Unload plugin until we really need it */
-+#if 0
-     if (module->b_loaded && module->b_unloadable)
-     {
-         module_Unload (module->handle);
-         module->b_loaded = false;
-     }
-+#endif
- 
-     /* For now we force loading if the module's config contains
-      * callbacks or actions.