diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-01 14:46:15 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-01 14:47:08 +0000 |
commit | 4729520c135dee23678c115b1db43361534794e3 (patch) | |
tree | 01e2f938d7ccba0b90c71c977ad7375501215c8d | |
parent | d36e402fae2b31ca2bf6eafbafa77d716ea99b15 (diff) | |
download | alpine_aports-4729520c135dee23678c115b1db43361534794e3.tar.bz2 alpine_aports-4729520c135dee23678c115b1db43361534794e3.tar.xz alpine_aports-4729520c135dee23678c115b1db43361534794e3.zip |
main/vlc: remove dlclose workaround
It appears to have been fixed in uclibc
-rw-r--r-- | main/vlc/APKBUILD | 15 | ||||
-rw-r--r-- | main/vlc/vlc-1.1.7-disable-cache-gen.patch | 12 | ||||
-rw-r--r-- | main/vlc/vlc-dlclose-workaround.patch | 20 |
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 @@ | |||
3 | pkgname=vlc | 3 | pkgname=vlc |
4 | pkgver=2.0.4 | 4 | pkgver=2.0.4 |
5 | _pkgver=${pkgver/_/-} | 5 | _pkgver=${pkgver/_/-} |
6 | pkgrel=0 | 6 | pkgrel=1 |
7 | pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" | 7 | pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" |
8 | pkgusers="vlc" | 8 | pkgusers="vlc" |
9 | pkggroups="vlc" | 9 | pkggroups="vlc" |
@@ -13,9 +13,6 @@ license="GPL-2" | |||
13 | triggers="$pkgname.trigger=/usr/lib/vlc/plugins" | 13 | triggers="$pkgname.trigger=/usr/lib/vlc/plugins" |
14 | subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg | 14 | subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg |
15 | $pkgname-daemon" | 15 | $pkgname-daemon" |
16 | #depends="fluidsynth zvbi lirc-utils libdca | ||
17 | # libproxy libcddb smbclient | ||
18 | # libmpcdec libmodplug" | ||
19 | depends="ttf-dejavu" | 16 | depends="ttf-dejavu" |
20 | makedepends=" | 17 | makedepends=" |
21 | a52dec-dev | 18 | a52dec-dev |
@@ -74,11 +71,8 @@ source="http://download.videolan.org/pub/videolan/$pkgname/$_pkgver/$pkgname-$_p | |||
74 | uclibc-inhibit-spawn.patch | 71 | uclibc-inhibit-spawn.patch |
75 | uclibc-no-xscreensaver.patch | 72 | uclibc-no-xscreensaver.patch |
76 | uclibc3.patch | 73 | uclibc3.patch |
77 | vlc-dlclose-workaround.patch | ||
78 | vlc.trigger | 74 | vlc.trigger |
79 | " | 75 | " |
80 | # uclibc-libcompat.patch | ||
81 | # vlc-1.1.7-disable-cache-gen.patch | ||
82 | 76 | ||
83 | _builddir="$srcdir"/$pkgname-$_pkgver | 77 | _builddir="$srcdir"/$pkgname-$_pkgver |
84 | prepare() { | 78 | prepare() { |
@@ -145,12 +139,6 @@ build () | |||
145 | --enable-xvideo \ | 139 | --enable-xvideo \ |
146 | || return 1 | 140 | || return 1 |
147 | 141 | ||
148 | # --enable-dvb \ | ||
149 | # --enable-snapshot \ | ||
150 | # --enable-hal \ | ||
151 | # --enable-lirc \ | ||
152 | # --enable-pvr \ | ||
153 | |||
154 | make || return 1 | 142 | make || return 1 |
155 | } | 143 | } |
156 | 144 | ||
@@ -235,5 +223,4 @@ md5sums="f36dab8f126922c56b372388b7fade47 vlc-2.0.4.tar.xz | |||
235 | 28349b8239fdd6987fbe0ca2c758517f uclibc-inhibit-spawn.patch | 223 | 28349b8239fdd6987fbe0ca2c758517f uclibc-inhibit-spawn.patch |
236 | b84c5a9121440b6a1dcf28792d783eb8 uclibc-no-xscreensaver.patch | 224 | b84c5a9121440b6a1dcf28792d783eb8 uclibc-no-xscreensaver.patch |
237 | 94f11ec8394775018222781a0c875444 uclibc3.patch | 225 | 94f11ec8394775018222781a0c875444 uclibc3.patch |
238 | 5aa45c7966b915801a0e449f56b6c454 vlc-dlclose-workaround.patch | ||
239 | 350b30698eb784def7d19446eb1d6c81 vlc.trigger" | 226 | 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 @@ | |||
1 | --- a/modules/Makefile.am | ||
2 | +++ b/modules/Makefile.am | ||
3 | @@ -63,7 +63,8 @@ | ||
4 | |||
5 | stamp-cache: | ||
6 | $(AM_V_GEN)if test "$(build)" = "$(host)"; then \ | ||
7 | - ../bin/vlc-cache-gen$(EXEEXT) . ; \ | ||
8 | + # ../bin/vlc-cache-gen$(EXEEXT) . ; \ | ||
9 | + echo "FIXME: vlc-cache-gen" ; \ | ||
10 | else \ | ||
11 | echo "Cross-compilation: cache generation skipped!" ; \ | ||
12 | 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 @@ | |||
1 | We have an issue with dlclose on uclibc on x86_64. | ||
2 | For now we work around it by simply not dlcose our plugins. | ||
3 | |||
4 | |||
5 | --- ./src/modules/bank.c.orig | ||
6 | +++ ./src/modules/bank.c | ||
7 | @@ -484,11 +484,13 @@ | ||
8 | assert (module->next == NULL); | ||
9 | |||
10 | /* Unload plugin until we really need it */ | ||
11 | +#if 0 | ||
12 | if (module->b_loaded && module->b_unloadable) | ||
13 | { | ||
14 | module_Unload (module->handle); | ||
15 | module->b_loaded = false; | ||
16 | } | ||
17 | +#endif | ||
18 | |||
19 | /* For now we force loading if the module's config contains | ||
20 | * callbacks or actions. | ||