diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-14 17:01:39 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-14 17:03:36 +0000 |
commit | 5ff9aeafdd6d11458f4c17d6bb5db7558126f2e7 (patch) | |
tree | 1d8307987af8c6b20453c9526e3b15d3c2819371 /community/vlc/APKBUILD | |
parent | 2ebf583060c9dfe3cf1df21e97e8d8d6e017ac22 (diff) | |
download | aports-5ff9aeafdd6d11458f4c17d6bb5db7558126f2e7.tar.bz2 aports-5ff9aeafdd6d11458f4c17d6bb5db7558126f2e7.tar.xz |
community/vlc: build with ffmpeg 3 and fix build with gcc6
Diffstat (limited to 'community/vlc/APKBUILD')
-rw-r--r-- | community/vlc/APKBUILD | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/community/vlc/APKBUILD b/community/vlc/APKBUILD index 83c90a3182..ba9674e311 100644 --- a/community/vlc/APKBUILD +++ b/community/vlc/APKBUILD @@ -5,7 +5,7 @@ pkgname=vlc pkgver=2.2.4 _pkgver=${pkgver/_/-} _ver=${_pkgver%[a-z]} -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -54,7 +54,7 @@ makedepends=" libtool dbus-dev faad2-dev - ffmpeg2.8-dev + ffmpeg-dev flac-dev freetype-dev fribidi-dev @@ -105,6 +105,8 @@ makedepends=" samba-dev " source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz + vlc-2.2.4-gcc6_fixes-1.patch + vlc-2.2.4-ffmpeg3-1.patch fix-waitpid-usage.patch omxil-rpi-codecs.patch vlc-libs.trigger" @@ -113,14 +115,15 @@ builddir="$srcdir"/$pkgname-$_ver prepare() { cd "$builddir" + default_prepare sed -i -e "/^libxscreensaver_plugin_la_SOURCES/s/^/#/" \ modules/misc/Modules.am || return 1 - ./bootstrap || return 1 + NOCONFIGURE=1 ./bootstrap || return 1 } build() { local _arch_opts= - export CXXFLAGS="$CXXFLAGS -std=gnu++98" + export CXXFLAGS="$CXXFLAGS -std=gnu++11" cd "$builddir" sed -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' \ -i modules/text_renderer/freetype.c @@ -323,15 +326,9 @@ plugins_video_filter() { _mv_plugins video_filter; } plugins_video_output() { _mv_plugins video_output; } plugins_visualization() { _mv_plugins visualization; } -md5sums="55666c9898f658c7fcca12725bf7dd1b vlc-2.2.4.tar.xz -b28925fdf3d1b0bd13e3af89668995a4 fix-waitpid-usage.patch -b90177830fe33b93849915752eb957ce omxil-rpi-codecs.patch -dd899a9926ad84db9446d92890a5aa3e vlc-libs.trigger" -sha256sums="1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be vlc-2.2.4.tar.xz -4f017a932d4177ba838ebd7bb0e36d8606103e62519805adff81e5edbda41026 fix-waitpid-usage.patch -27e8f960ca091216b491980a6ffd4e35b28f2091677231ba1d317fc81b6ee039 omxil-rpi-codecs.patch -1c93af2feb217a06f6adc3cd51def8f00eea431f9d26ace7b90c377f7e85fc7a vlc-libs.trigger" sha512sums="2fc1fe957ba7903f2e0c9640884ed850cb10a60132d80658dee8da0b5abaf4a6ccdf95fa2b8c0a4a827be5e7e40341318bce44662a5248e04442f4779010f85c vlc-2.2.4.tar.xz +0dffb15a320899060d2239d4bbefd7e88bedcd017348227092ed943b1104e971a5da934f0c1569773230186d4727be83f530cc0d253559a04d1f2cdef80e6043 vlc-2.2.4-gcc6_fixes-1.patch +3ac37f5d552b3f4a536ead974756ea39142bb1aebbb5fa4fd41917e3dabb5af333dea5ae028bdae8589ff3016f2d1d87ea328e63d8b795ac90c3eb11945ea87b vlc-2.2.4-ffmpeg3-1.patch 680cfa3eed5501ba6f06c51eae508204f4c77d2bdd07eead1a3da3939b433abfe84025d133e7a1c7a869e4ffac374bd5eba2bd3dd242ec4645e1d1c6122d0ffb fix-waitpid-usage.patch e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406 vlc-libs.trigger" |