diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-07 15:00:50 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-07 15:00:50 +0000 |
commit | 77341608661f30f28801a160ca195cf02f5a3caa (patch) | |
tree | 99dce5c7678ec0e5f43ab7397c3a608230717fde /main | |
parent | 304c15f39c09cabeb81bbf573e0faa17c299236f (diff) | |
download | aports-77341608661f30f28801a160ca195cf02f5a3caa.tar.bz2 aports-77341608661f30f28801a160ca195cf02f5a3caa.tar.xz |
{main => community}/ffmpeg: move due to v4l-utils
v4l-utils moved to community so we need to move ffmpeg too
Diffstat (limited to 'main')
-rw-r--r-- | main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch | 55 | ||||
-rw-r--r-- | main/ffmpeg/APKBUILD | 105 |
2 files changed, 0 insertions, 160 deletions
diff --git a/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch deleted file mode 100644 index 93e3ac9957..0000000000 --- a/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ab11be0becb90542f10d5713659b559842c53af2 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 29 Mar 2016 15:15:17 +0200 -Subject: [PATCH] libavutil: clean up unused FF_SYMVER macro - -There is nothing using it since commit d63443b9 (lavc: drop the -av_fast_{re,m}alloc compatibility wrappers). - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - libavutil/internal.h | 28 ---------------------------- - 1 file changed, 28 deletions(-) - -diff --git a/libavutil/internal.h b/libavutil/internal.h -index 61784b5..69d63d5 100644 ---- a/libavutil/internal.h -+++ b/libavutil/internal.h -@@ -177,34 +177,6 @@ - #endif - - /** -- * Define a function with only the non-default version specified. -- * -- * On systems with ELF shared libraries, all symbols exported from -- * FFmpeg libraries are tagged with the name and major version of the -- * library to which they belong. If a function is moved from one -- * library to another, a wrapper must be retained in the original -- * location to preserve binary compatibility. -- * -- * Functions defined with this macro will never be used to resolve -- * symbols by the build-time linker. -- * -- * @param type return type of function -- * @param name name of function -- * @param args argument list of function -- * @param ver version tag to assign function -- */ --#if HAVE_SYMVER_ASM_LABEL --# define FF_SYMVER(type, name, args, ver) \ -- type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver); \ -- type ff_##name args --#elif HAVE_SYMVER_GNU_ASM --# define FF_SYMVER(type, name, args, ver) \ -- __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver); \ -- type ff_##name args; \ -- type ff_##name args --#endif -- --/** - * Return NULL if a threading library has not been enabled. - * Used to disable threading functions in AVCodec definitions - * when not needed. --- -2.7.4 - diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD deleted file mode 100644 index 37f30bcadd..0000000000 --- a/main/ffmpeg/APKBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Contributor: Sergei Lukin <sergej.lukin@gmail.com> -# Contributor: Ćukasz Jendrysik <scadu@yandex.com> -# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=ffmpeg -pkgver=3.4.2 -pkgrel=0 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -url="http://ffmpeg.org/" -arch="all" -license="GPL" -options="!check" # tests/data/hls-lists.append.m3u8 fails -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-dev - imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl-dev libvpx-dev - libvpx-dev sdl2-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev - v4l-utils-dev yasm opus-dev x265-dev" -checkdepends="rsync" -source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz - 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch - " -builddir="$srcdir/$pkgname-$pkgver" - -# secfixes: -# 3.3.4-r0: -# - CVE-2017-14054 -# - CVE-2017-14055 -# - CVE-2017-14056 -# - CVE-2017-14057 -# - CVE-2017-14058 -# - CVE-2017-14059 -# - CVE-2017-14169 -# - CVE-2017-14170 -# - CVE-2017-14171 -# - CVE-2017-14222 -# - CVE-2017-14223 -# - CVE-2017-14225 - -build() { - local _dbg="--disable-debug" - local _asm="" - [ -n "$DEBUG" ] && _dbg="--enable-debug" - - case "$CARCH" in - x86 | arm*) _asm="--disable-asm" ;; - esac - - cd "$builddir" - ./configure \ - --prefix=/usr \ - --enable-avresample \ - --enable-avfilter \ - --enable-gnutls \ - --enable-gpl \ - --enable-libmp3lame \ - --enable-librtmp \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-postproc \ - --enable-pic \ - --enable-pthreads \ - --enable-shared \ - --enable-libxcb \ - --disable-stripping \ - --disable-static \ - --enable-vaapi \ - --enable-vdpau \ - --enable-libopus \ - $_asm $_dbg - make - ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c - make doc/ffmpeg.1 doc/ffplay.1 doc/ffserver.1 -} - -# https://ffmpeg.org/fate.html -check() { - cd "$builddir" - ./configure \ - --samples=fate-suite/ - make fate-rsync - make fate-list - make fate -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -# strip --strip-debug "$pkgdir"/usr/lib/*.a -} - -libs() { - pkgdesc="Libraries for ffmpeg" - replaces="ffmpeg" - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/lib "$subpkgdir"/usr -} - -sha512sums="9fb6df5ddde8af51b929180192d29210695deeef61211fb8a69206bdeabba729cd47e346e4dcf6f27c3416ed77383d30b51933e75fc515466404f85d105bb301 ffmpeg-3.4.2.tar.xz -32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" |