diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-22 11:37:55 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-22 12:29:55 +0000 |
commit | 10799d2feeae328faca4167d8d50482f12e2900b (patch) | |
tree | c03a4ebfe63d401ab0eac88b6b657449db396980 | |
parent | f87837865c8fd96828d22e928186f92c3c59aaf2 (diff) | |
download | alpine_aports-10799d2feeae328faca4167d8d50482f12e2900b.tar.bz2 alpine_aports-10799d2feeae328faca4167d8d50482f12e2900b.tar.xz alpine_aports-10799d2feeae328faca4167d8d50482f12e2900b.zip |
main/ffmpeg2.8: remove
we only support ffmpeg 3 now
-rw-r--r-- | main/ffmpeg2.8/APKBUILD | 88 | ||||
-rw-r--r-- | main/ffmpeg2.8/configure-dlvsym.patch | 28 | ||||
-rw-r--r-- | main/ffmpeg2.8/fix-flv-extradata.patch | 44 |
3 files changed, 0 insertions, 160 deletions
diff --git a/main/ffmpeg2.8/APKBUILD b/main/ffmpeg2.8/APKBUILD deleted file mode 100644 index 99411e3b93..0000000000 --- a/main/ffmpeg2.8/APKBUILD +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | # Contributor: Ćukasz Jendrysik <scadu@yandex.com> | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=ffmpeg2.8 | ||
4 | pkgver=2.8.10 | ||
5 | pkgrel=1 | ||
6 | pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" | ||
7 | url="http://ffmpeg.org/" | ||
8 | arch="all" | ||
9 | license="GPL" | ||
10 | subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" | ||
11 | makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev | ||
12 | imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl-dev libvpx-dev | ||
13 | libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev | ||
14 | v4l-utils-dev yasm opus-dev x265-dev" | ||
15 | depends= | ||
16 | source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 | ||
17 | configure-dlvsym.patch | ||
18 | fix-flv-extradata.patch | ||
19 | " | ||
20 | |||
21 | _builddir="$srcdir"/ffmpeg-$pkgver | ||
22 | prepare() { | ||
23 | cd "$_builddir" | ||
24 | for i in $source; do | ||
25 | case $i in | ||
26 | *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; | ||
27 | esac | ||
28 | done | ||
29 | } | ||
30 | |||
31 | build() { | ||
32 | local _dbg="--disable-debug" | ||
33 | local _asm="" | ||
34 | [ -n "$DEBUG" ] && _dbg="--enable-debug" | ||
35 | |||
36 | case "$CARCH" in | ||
37 | x86 | ppc* | arm*) _asm="--disable-asm" ;; | ||
38 | esac | ||
39 | |||
40 | cd "$_builddir" | ||
41 | ./configure \ | ||
42 | --prefix=/usr \ | ||
43 | --enable-avresample \ | ||
44 | --enable-avfilter \ | ||
45 | --enable-gnutls \ | ||
46 | --enable-gpl \ | ||
47 | --enable-libmp3lame \ | ||
48 | --enable-librtmp \ | ||
49 | --enable-libvorbis \ | ||
50 | --enable-libvpx \ | ||
51 | --enable-libxvid \ | ||
52 | --enable-libx264 \ | ||
53 | --enable-libx265 \ | ||
54 | --enable-libtheora \ | ||
55 | --enable-libv4l2 \ | ||
56 | --enable-postproc \ | ||
57 | --enable-pic \ | ||
58 | --enable-pthreads \ | ||
59 | --enable-shared \ | ||
60 | --enable-x11grab \ | ||
61 | --disable-stripping \ | ||
62 | --disable-static \ | ||
63 | --enable-vaapi \ | ||
64 | --enable-libopus \ | ||
65 | $_asm $_dbg \ | ||
66 | || return 1 | ||
67 | make || return 1 | ||
68 | ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c || return 1 | ||
69 | make doc/ffmpeg.1 doc/ffplay.1 doc/ffserver.1 || return 1 | ||
70 | } | ||
71 | |||
72 | package() { | ||
73 | cd "$_builddir" | ||
74 | make DESTDIR="$pkgdir" install install-man || return 1 | ||
75 | install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1 | ||
76 | # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 | ||
77 | } | ||
78 | |||
79 | libs() { | ||
80 | pkgdesc="Libraries for ffmpeg" | ||
81 | replaces="ffmpeg" | ||
82 | mkdir -p "$subpkgdir"/usr | ||
83 | mv "$pkgdir"/usr/lib "$subpkgdir"/usr | ||
84 | } | ||
85 | |||
86 | sha512sums="1ca8b0060361c49de201afc463bcd7c9340f09bbd116dff2539653bc36411d60cdf667874d2ec51664e141ee7a7be8bebc94e158687cb97db6bdfa40f00ec193 ffmpeg-2.8.10.tar.bz2 | ||
87 | d9bb652093b1c2d03cead78bcafd59fc8305f36fe5359ac5d7caf038889f1239829e288c07e77a11bbef89de5fe54a5eae50a1c4718ec77137bb677ef9069e54 configure-dlvsym.patch | ||
88 | d4d369055ef9ec8742f971786b05b89a5748a32cee711f623b71e8aea54b004bebda4e618017a351162647360632b13bcc7f09059938734e692ec841fe769c46 fix-flv-extradata.patch" | ||
diff --git a/main/ffmpeg2.8/configure-dlvsym.patch b/main/ffmpeg2.8/configure-dlvsym.patch deleted file mode 100644 index 0e74e45b5c..0000000000 --- a/main/ffmpeg2.8/configure-dlvsym.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | --- ./configure.orig | ||
2 | +++ ./configure | ||
3 | @@ -1680,6 +1680,7 @@ | ||
4 | CoTaskMemFree | ||
5 | CryptGenRandom | ||
6 | dlopen | ||
7 | + dlvsym | ||
8 | fcntl | ||
9 | flt_lim | ||
10 | fork | ||
11 | @@ -4997,14 +4998,15 @@ | ||
12 | -Wl,--wrap,sws_scale || | ||
13 | disable xmm_clobber_test | ||
14 | |||
15 | +check_func dlvsym -lld | ||
16 | echo "X{};" > $TMPV | ||
17 | if test_ldflags -Wl,--version-script,$TMPV; then | ||
18 | append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' | ||
19 | - check_cc <<EOF && enable symver_asm_label | ||
20 | + enabled dlvsym && check_cc <<EOF && enable symver_asm_label | ||
21 | void ff_foo(void) __asm__ ("av_foo@VERSION"); | ||
22 | void ff_foo(void) { ${inline_asm+__asm__($quotes);} } | ||
23 | EOF | ||
24 | - check_cc <<EOF && enable symver_gnu_asm | ||
25 | + enabled dlvsym && check_cc <<EOF && enable symver_gnu_asm | ||
26 | __asm__(".symver ff_foo,av_foo@VERSION"); | ||
27 | void ff_foo(void) {} | ||
28 | EOF | ||
diff --git a/main/ffmpeg2.8/fix-flv-extradata.patch b/main/ffmpeg2.8/fix-flv-extradata.patch deleted file mode 100644 index 2fe5b08bcc..0000000000 --- a/main/ffmpeg2.8/fix-flv-extradata.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | https://trac.ffmpeg.org/ticket/3175 | ||
2 | |||
3 | This patch is slightly cleaned up version of: | ||
4 | http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2014-May/157791.html | ||
5 | |||
6 | diff -ru ffmpeg-2.3.4.orig/libavformat/flvenc.c ffmpeg-2.3.4/libavformat/flvenc.c | ||
7 | --- ffmpeg-2.3.4.orig/libavformat/flvenc.c 2014-10-03 04:49:20.000000000 -0300 | ||
8 | +++ ffmpeg-2.3.4/libavformat/flvenc.c 2014-12-04 11:37:23.286586875 -0200 | ||
9 | @@ -414,11 +414,35 @@ | ||
10 | if (enc->codec_id == AV_CODEC_ID_AAC) { | ||
11 | avio_w8(pb, get_audio_flags(s, enc)); | ||
12 | avio_w8(pb, 0); // AAC sequence header | ||
13 | + if (enc->extradata_size < 2) { | ||
14 | + static const int mpeg4audio_sample_rates[16] = { | ||
15 | + 96000, 88200, 64000, 48000, 44100, 32000, | ||
16 | + 24000, 22050, 16000, 12000, 11025, 8000, 7350 | ||
17 | + }; | ||
18 | + int sample_rate_index; | ||
19 | + | ||
20 | + av_log(s, AV_LOG_WARNING, "AAC extradata empty!.\n"); | ||
21 | + for (sample_rate_index = 0; sample_rate_index < 16; sample_rate_index++) | ||
22 | + if (enc->sample_rate == mpeg4audio_sample_rates[sample_rate_index]) | ||
23 | + break; | ||
24 | + | ||
25 | + if (sample_rate_index < 16 && (enc->extradata = av_mallocz(2)) != NULL) { | ||
26 | + enc->extradata_size = 2; | ||
27 | + enc->extradata[0] = 0x10 | (sample_rate_index>>1); | ||
28 | + enc->extradata[1] = (sample_rate_index & 0x01)<<7 | enc->channels <<3; | ||
29 | + } | ||
30 | + } | ||
31 | + if (enc->extradata_size >= 2) | ||
32 | + av_log(s, AV_LOG_DEBUG, "AAC extradata size %d: %02x:%02x.\n", enc->extradata_size, enc->extradata[0], enc->extradata[1]); | ||
33 | avio_write(pb, enc->extradata, enc->extradata_size); | ||
34 | } else { | ||
35 | avio_w8(pb, enc->codec_tag | FLV_FRAME_KEY); // flags | ||
36 | avio_w8(pb, 0); // AVC sequence header | ||
37 | avio_wb24(pb, 0); // composition time | ||
38 | + if(enc->extradata_size>=2) | ||
39 | + av_log(s, AV_LOG_DEBUG, "Video extradata size %d: %02x:%02x.\n", enc->extradata_size, enc->extradata[0], enc->extradata[1]); | ||
40 | + else | ||
41 | + av_log(s, AV_LOG_WARNING, "Video extradata empty!.\n"); | ||
42 | ff_isom_write_avcc(pb, enc->extradata, enc->extradata_size); | ||
43 | } | ||
44 | data_size = avio_tell(pb) - pos; | ||