diff options
author | Daniel Bermond | 2017-08-16 15:52:32 -0300 |
---|---|---|
committer | Daniel Bermond | 2017-08-16 15:52:32 -0300 |
commit | 990c4f306e45f8422792df4752bef348e1c1fa73 (patch) | |
tree | 439e6f4e24517bf9027994334717938070fe0085 | |
parent | 7447b5594434c071f237c809b8fe75a8ce6f4141 (diff) | |
download | aur-990c4f306e45f8422792df4752bef348e1c1fa73.tar.gz |
openjpeg 2.2 fix / x265 2.5 rebuild
Also removed netcdf (removed from upstream) and the unneeded
documentation targets for make.
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | ffmpeg-openjpeg2.2.patch | 95 |
3 files changed, 114 insertions, 12 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Aug 5 19:57:09 UTC 2017 +# Wed Aug 16 18:46:22 UTC 2017 pkgbase = ffmpeg-decklink pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled) pkgver = 3.3.3 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = http://ffmpeg.org/ arch = i686 @@ -47,7 +47,6 @@ pkgbase = ffmpeg-decklink depends = libass.so depends = libbluray.so depends = libfreetype.so - depends = libnetcdf.so depends = libvidstab.so depends = libvorbisenc.so depends = libvorbis.so @@ -69,8 +68,10 @@ pkgbase = ffmpeg-decklink conflicts = ffmpeg conflicts = ffmpeg-git source = https://ffmpeg.org/releases/ffmpeg-3.3.3.tar.xz + source = ffmpeg-openjpeg2.2.patch source = LICENSE sha256sums = d2a9002cdc6b533b59728827186c044ad02ba64841f1b7cd6c21779875453a1e + sha256sums = 490598f78d7879af8ef5b8d7f92ada83d0ee64f9609f6c7b989eb331c2539f68 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 pkgname = ffmpeg-decklink @@ -4,8 +4,9 @@ # This package is a modified version of extra/ffmpeg with --enable-decklink pkgname=ffmpeg-decklink +_srcname=ffmpeg pkgver=3.3.3 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)' arch=('i686' 'x86_64') @@ -16,9 +17,9 @@ depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus' 'schroedinger' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib' - 'libass.so' 'libbluray.so' 'libfreetype.so' 'libnetcdf.so' - 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' - 'libx264.so' 'libx265.so' 'libxvidcore.so') + 'libass.so' 'libbluray.so' 'libfreetype.so' 'libvidstab.so' + 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' + 'libx265.so' 'libxvidcore.so') makedepends=( # binary repositories: 'ladspa' 'yasm' @@ -31,14 +32,21 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libswscale.so' 'ffmpeg') conflicts=('ffmpeg' 'ffmpeg-git') source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz" + 'ffmpeg-openjpeg2.2.patch' 'LICENSE') sha256sums=('d2a9002cdc6b533b59728827186c044ad02ba64841f1b7cd6c21779875453a1e' + '490598f78d7879af8ef5b8d7f92ada83d0ee64f9609f6c7b989eb331c2539f68' '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') +prepare() { + cd "${_srcname}-${pkgver}" + patch -Np1 -i "${srcdir}/ffmpeg-openjpeg2.2.patch" +} + build() { - cd "ffmpeg-${pkgver}" + cd "${_srcname}-${pkgver}" - msg2 "Running ffmpeg configure script. Please wait..." + msg2 'Running ffmpeg configure script. Please wait...' ./configure \ --prefix='/usr' \ @@ -79,7 +87,6 @@ build() { --enable-libx265 \ --enable-libxcb \ --enable-libxvid \ - --enable-netcdf \ --enable-shared \ --enable-version3 \ --enable-nonfree \ @@ -87,11 +94,10 @@ build() { make make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 } package() { - cd "ffmpeg-${pkgver}" + cd "${_srcname}-${pkgver}" make DESTDIR="$pkgdir" install install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart" diff --git a/ffmpeg-openjpeg2.2.patch b/ffmpeg-openjpeg2.2.patch new file mode 100644 index 000000000000..d23c91453dc3 --- /dev/null +++ b/ffmpeg-openjpeg2.2.patch @@ -0,0 +1,95 @@ +diff -rupN ffmpeg-3.3.3.orig/configure ffmpeg-3.3.3/configure +--- ffmpeg-3.3.3.orig/configure 2017-07-29 19:49:29.000000000 +0200 ++++ ffmpeg-3.3.3/configure 2017-08-15 13:21:28.782566614 +0200 +@@ -1875,6 +1875,7 @@ HEADERS_LIST=" + machine_ioctl_meteor_h + malloc_h + opencv2_core_core_c_h ++ openjpeg_2_2_openjpeg_h + openjpeg_2_1_openjpeg_h + openjpeg_2_0_openjpeg_h + openjpeg_1_5_openjpeg_h +@@ -5805,7 +5806,9 @@ enabled libopencv && { check_hea + require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || + require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } + enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion +-enabled libopenjpeg && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || ++enabled libopenjpeg && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || ++ check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 || ++ { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || + { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || +diff -rupN ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c ffmpeg-3.3.3/libavcodec/libopenjpegdec.c +--- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c 2017-07-29 19:49:30.000000000 +0200 ++++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c 2017-08-15 13:21:28.869233484 +0200 +@@ -34,7 +34,9 @@ + #include "internal.h" + #include "thread.h" + +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H ++# include <openjpeg-2.2/openjpeg.h> ++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H + # include <openjpeg-2.1/openjpeg.h> + #elif HAVE_OPENJPEG_2_0_OPENJPEG_H + # include <openjpeg-2.0/openjpeg.h> +@@ -44,7 +46,7 @@ + # include <openjpeg.h> + #endif + +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H + # define OPENJPEG_MAJOR_VERSION 2 + # define OPJ(x) OPJ_##x + #else +@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo + opj_stream_set_read_function(stream, stream_read); + opj_stream_set_skip_function(stream, stream_skip); + opj_stream_set_seek_function(stream, stream_seek); +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H + opj_stream_set_user_data(stream, &reader, NULL); + #elif HAVE_OPENJPEG_2_0_OPENJPEG_H + opj_stream_set_user_data(stream, &reader); +diff -rupN ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c ffmpeg-3.3.3/libavcodec/libopenjpegenc.c +--- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c 2017-07-29 19:49:30.000000000 +0200 ++++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c 2017-08-15 13:21:28.869233484 +0200 +@@ -32,7 +32,9 @@ + #include "avcodec.h" + #include "internal.h" + +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H ++# include <openjpeg-2.2/openjpeg.h> ++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H + # include <openjpeg-2.1/openjpeg.h> + #elif HAVE_OPENJPEG_2_0_OPENJPEG_H + # include <openjpeg-2.0/openjpeg.h> +@@ -42,7 +44,7 @@ + # include <openjpeg.h> + #endif + +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H + # define OPENJPEG_MAJOR_VERSION 2 + # define OPJ(x) OPJ_##x + #else +@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in + + opj_set_default_encoder_parameters(&ctx->enc_params); + +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H + switch (ctx->cinema_mode) { + case OPJ_CINEMA2K_24: + ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K; +@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo + opj_stream_set_write_function(stream, stream_write); + opj_stream_set_skip_function(stream, stream_skip); + opj_stream_set_seek_function(stream, stream_seek); +-#if HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H + opj_stream_set_user_data(stream, &writer, NULL); + #elif HAVE_OPENJPEG_2_0_OPENJPEG_H + opj_stream_set_user_data(stream, &writer); |