* [gentoo-commits] repo/gentoo:master commit in: www-plugins/freshplayerplugin/, www-plugins/freshplayerplugin/files/
@ 2016-10-13 18:14 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2016-10-13 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 09277371d30e5cc2c325fb3c76df4e6ca47168f3
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 18:14:08 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 18:14:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09277371
www-plugins/freshplayerplugin: Drop old versions with unresolvable deps
Package-Manager: portage-2.3.2
www-plugins/freshplayerplugin/Manifest | 1 -
.../freshplayerplugin/files/0.2.4-cmake.patch | 59 ---------------
.../freshplayerplugin-0.3.2.ebuild | 82 ---------------------
.../freshplayerplugin-0.3.5.ebuild | 85 ----------------------
4 files changed, 227 deletions(-)
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 4097ca7..58cfd8d 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,2 +1 @@
-DIST freshplayerplugin-0.3.2.tar.gz 2713241 SHA256 b3687b9d67ab88c64fea32b17f281f142bf861e33d9135b00da5d90d385d9ce5 SHA512 9c908ce1a168c0797dc3b0da8e98d722cc32d729acb1c4a8f38b7e95c23fe870baabe4b3f8790d021711578fdb9a61f44aba27cebb924fec9aabcf8cd91323e5 WHIRLPOOL 2e9b78bcc3605409ec6853caf31aab03658c044e0d05449a620b31261323856503db8db960db9992d6db4fd61df8f9feb05800124c2f4a450c4ff65b22fc7c34
DIST freshplayerplugin-0.3.5.tar.gz 781003 SHA256 b08f7c6690de13b1e358fef4cab41cb303b9e80b3504678e94c9646f44dd7104 SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0 WHIRLPOOL cf22758e0ed947db27e8e6e053f17bafc425beebebd9314008eef105e828a0a51f73fd42f2d0c00e12e56f817e2b9078baeb55bd54a6c6a55e8ebd00d2e27ccc
diff --git a/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch b/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch
deleted file mode 100644
index 3ad1523..00000000
--- a/www-plugins/freshplayerplugin/files/0.2.4-cmake.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -uarN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-04-25 11:17:24.000000000 -0400
-+++ b/CMakeLists.txt 2015-04-26 20:14:43.152014529 -0400
-@@ -61,35 +61,36 @@
- # optional dependencies
- message(STATUS "checking for optional dependencies")
-
--pkg_check_modules(PULSEAUDIO QUIET libpulse)
--pkg_check_modules(JACK QUIET jack)
--pkg_check_modules(SOXR QUIET soxr)
- set(WITH_PULSEAUDIO TRUE CACHE STRING "enable PulseAudio support")
- set(WITH_JACK TRUE CACHE STRING "enable JACK Audio Connection Kit")
-
--if (PULSEAUDIO_FOUND AND WITH_PULSEAUDIO)
-+if (WITH_PULSEAUDIO)
-+ pkg_check_modules(PULSEAUDIO libpulse)
-+ if (NOT PULSEAUDIO_FOUND)
-+ message(FATAL_ERROR "PulseAudio requested but not found.")
-+ endif()
- add_definitions(-DHAVE_PULSEAUDIO=1)
-- message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION} (optional)")
-+ message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION}")
- list(APPEND REQ_LIBRARY_DIRS ${PULSEAUDIO_LIBRARY_DIRS})
- list(APPEND REQ_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIRS})
- list(APPEND REQ_LIBRARIES ${PULSEAUDIO_LIBRARIES})
--else()
-- message(STATUS " no libpulse found (optional)")
- endif()
-
--if (JACK_FOUND AND WITH_JACK)
-- message(STATUS " found jack, version ${JACK_VERSION} (optional)")
-- if (SOXR_FOUND)
-- message(STATUS " found soxr, version ${SOXR_VERSION}")
-- add_definitions(-DHAVE_JACK=1)
-- list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
-- list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
-- list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
-- else()
-- message(STATUS " no soxr found, JACK output disabled")
-+if (WITH_JACK)
-+ pkg_check_modules(JACK QUIET jack)
-+ if (NOT JACK_FOUND)
-+ message(FATAL_ERROR "JACK support requested but not found.")
-+ endif()
-+ pkg_check_modules(SOXR QUIET soxr)
-+ if (NOT SOXR_FOUND)
-+ message(FATAL_ERROR "SOXR libray not found but needed for JACK support.")
- endif()
--else()
-- message(STATUS " no jack found (optional)")
-+ message(STATUS " found jack, version ${JACK_VERSION}")
-+ message(STATUS " found soxr, version ${SOXR_VERSION}")
-+ add_definitions(-DHAVE_JACK=1)
-+ list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
-+ list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
-+ list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
- endif()
-
- list(APPEND REQ_LIBRARIES img-resources)
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
deleted file mode 100644
index 3bb24e7..00000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MIN_VERSION="2.8.8"
-
-inherit cmake-utils multilib
-
-LICENSE="MIT"
-HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
-DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT=0
-IUSE="gtk3 jack libav pulseaudio vaapi vdpau"
-
-KEYWORDS="amd64"
-
-HWDEC_DEPEND="
- libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
- !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
- x11-libs/libva
- x11-libs/libvdpau
-"
-
-CDEPEND="
- dev-libs/glib:2=
- dev-libs/libconfig:=
- dev-libs/libevent:=[threads]
- dev-libs/openssl:0=
- media-libs/alsa-lib:=
- media-libs/freetype:2=
- media-libs/libv4l:0=
- media-libs/mesa:=[egl,gles2]
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libdrm:=
- x11-libs/pango:=[X]
- jack? ( media-sound/jack-audio-connection-kit )
- pulseaudio? ( media-sound/pulseaudio )
- !gtk3? ( x11-libs/gtk+:2= )
- gtk3? ( x11-libs/gtk+:3= )
- vaapi? ( ${HWDEC_DEPEND} )
- vdpau? ( ${HWDEC_DEPEND} )
-"
-
-DEPEND="${CDEPEND}
- dev-util/ragel
- virtual/pkgconfig
- "
-RDEPEND="${CDEPEND}
- || (
- www-plugins/chrome-binary-plugins[flash]
- www-client/google-chrome
- www-client/google-chrome-beta
- www-client/google-chrome-unstable
- )
- "
-
-PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" )
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with jack JACK)
- $(cmake-utils_use_with pulseaudio PULSEAUDIO)
- -DWITH_GTK=$(usex gtk3 3 2)
- -DCMAKE_SKIP_RPATH=1
- )
- if use vaapi || use vdpau ; then
- mycmakeargs+=( -DWITH_HWDEC=1 )
- else
- mycmakeargs+=( -DWITH_HWDEC=0 )
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- dodoc ChangeLog data/freshwrapper.conf.example README.md
- exeinto /usr/$(get_libdir)/nsbrowser/plugins
- doexe "${BUILD_DIR}/libfreshwrapper-pepperflash.so"
-}
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5.ebuild
deleted file mode 100644
index c6b4a10..00000000
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_MIN_VERSION="2.8.8"
-
-inherit cmake-utils
-
-LICENSE="MIT"
-HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
-DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT=0
-IUSE="gles2 gtk3 jack libav libressl pulseaudio v4l vaapi vdpau"
-
-KEYWORDS="~amd64"
-
-HWDEC_DEPEND="
- libav? ( media-video/libav:0=[vaapi?,vdpau?] )
- !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
- x11-libs/libva
- x11-libs/libvdpau
-"
-
-COMMON_DEPEND="
- dev-libs/glib:2=
- dev-libs/icu:0=
- dev-libs/libevent:=[threads]
- media-libs/alsa-lib:=
- media-libs/freetype:2=
- media-libs/mesa:=[egl,gles2?]
- x11-libs/cairo:=[X]
- x11-libs/libXcursor:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libdrm:=
- x11-libs/pango:=[X]
- jack? (
- media-sound/jack-audio-connection-kit
- media-libs/soxr
- )
- pulseaudio? ( media-sound/pulseaudio )
- !gtk3? ( x11-libs/gtk+:2= )
- gtk3? ( x11-libs/gtk+:3= )
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- v4l? ( media-libs/libv4l:0= )
- vaapi? ( ${HWDEC_DEPEND} )
- vdpau? ( ${HWDEC_DEPEND} )
-"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/ragel
- virtual/pkgconfig
- "
-RDEPEND="${COMMON_DEPEND}
- || (
- www-plugins/chrome-binary-plugins[flash]
- www-client/google-chrome
- www-client/google-chrome-beta
- www-client/google-chrome-unstable
- )
- "
-
-PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
-DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
-
-src_configure() {
- mycmakeargs=(
- -DWITH_JACK=$(usex jack)
- -DWITH_PULSEAUDIO=$(usex pulseaudio)
- -DWITH_GTK=$(usex gtk3 3 2)
- -DWITH_GLES2=$(usex gles2)
- -DWITH_LIBV4L2=$(usex v4l)
- -DCMAKE_SKIP_RPATH=1
- )
- if use vaapi || use vdpau ; then
- mycmakeargs+=( -DWITH_HWDEC=1 )
- else
- mycmakeargs+=( -DWITH_HWDEC=0 )
- fi
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-plugins/freshplayerplugin/, www-plugins/freshplayerplugin/files/
@ 2018-01-11 1:09 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2018-01-11 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 7c68ec36294f89a4da4554dc803cfef58c7eecbb
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 01:08:46 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 01:08:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c68ec36
www-plugins/freshplayerplugin: Version bump to 0.3.9
Closes: https://bugs.gentoo.org/641640
Closes: https://bugs.gentoo.org/642228
Package-Manager: Portage-2.3.19, Repoman-2.3.6
www-plugins/freshplayerplugin/Manifest | 1 +
.../freshplayerplugin/files/0.3.9-ioctl.patch | 11 ++++
.../freshplayerplugin-0.3.9.ebuild | 74 ++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 1f7aad93dd0..32f75890683 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,2 +1,3 @@
DIST freshplayerplugin-0.3.5.tar.gz 781003 BLAKE2B 9874f07905a277c95374a697397dc9b3661cdba40b39ee74702d4ec67a0447d13cc2a187c695b47be9f922177b37bdf5fff8ebb9dd57b709f884ffa3db0da54d SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0
DIST freshplayerplugin-0.3.7.tar.gz 789974 BLAKE2B 0217e3431164e9dfce4ec21f07331aea4b5841b963c51c258f10c68d8089b8f860364d58af533f3724f8759b8d6381cba950f174b2ca3f0a7b59c581192b5a47 SHA512 9ef534b873833d69caa86a5702ad6150e4aa2fe399159a550b6cb0ebad2754d25e185c54b6285f6f50913c5595c5b460ce3e0d21ac45f0d25793805463ce1d5d
+DIST freshplayerplugin-0.3.9.tar.gz 790261 BLAKE2B 88526c01e7a06c7b295e5a7652602eb661097f869b30c8fd0978a4e03adea9d1fa75d35e5e9c0751d786c04f0247fc292aa0c1857cf1fa575eb0b11499bec7fc SHA512 999d7c223dd493e43a0fa7874371c7b781fe5273b2661fc30f814832b4aafd23f297795b644f58553107ef962ca17ce58fb39a637d1ab7bdf470cd33e0b19cf8
diff --git a/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch b/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch
new file mode 100644
index 00000000000..112b839016f
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.9-ioctl.patch
@@ -0,0 +1,11 @@
+diff -aurN a/src/ppb_video_capture.c b/src/ppb_video_capture.c
+--- a/src/ppb_video_capture.c 2017-12-23 09:34:01.000000000 -0500
++++ b/src/ppb_video_capture.c 2018-01-10 20:03:05.498415644 -0500
+@@ -75,6 +75,7 @@
+
+ #if !HAVE_LIBV4L2
+ // define simple wrappers, if libv4l2 is not used
++#include <sys/ioctl.h>
+ static
+ ssize_t
+ v4l2_read(int fd, void *buffer, size_t n)
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
new file mode 100644
index 00000000000..4348e877cbf
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+LICENSE="MIT"
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT=0
+IUSE="gles2 jack libav libressl pulseaudio v4l vaapi vdpau"
+
+KEYWORDS="~amd64"
+
+HWDEC_DEPEND="
+ libav? ( media-video/libav:0=[vaapi?,vdpau?] )
+ !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
+ x11-libs/libva:=
+ x11-libs/libvdpau
+"
+
+COMMON_DEPEND="
+ dev-libs/glib:2=
+ dev-libs/icu:0=
+ dev-libs/libevent:=[threads]
+ media-libs/alsa-lib:=
+ media-libs/freetype:2=
+ media-libs/mesa:=[egl,gles2?]
+ x11-libs/cairo:=[X]
+ x11-libs/libXcursor:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libdrm:=
+ x11-libs/pango:=[X]
+ jack? (
+ media-sound/jack-audio-connection-kit
+ media-libs/soxr
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ v4l? ( media-libs/libv4l:0= )
+ vaapi? ( ${HWDEC_DEPEND} )
+ vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/ragel
+ virtual/pkgconfig
+ "
+RDEPEND="${COMMON_DEPEND}
+ www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
+ "
+
+PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.9-ioctl.patch" )
+DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_JACK=$(usex jack)
+ -DWITH_PULSEAUDIO=$(usex pulseaudio)
+ -DWITH_GLES2=$(usex gles2)
+ -DWITH_LIBV4L2=$(usex v4l)
+ -DCMAKE_SKIP_RPATH=1
+ )
+ if use vaapi || use vdpau ; then
+ mycmakeargs+=( -DWITH_HWDEC=1 )
+ else
+ mycmakeargs+=( -DWITH_HWDEC=0 )
+ fi
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-plugins/freshplayerplugin/, www-plugins/freshplayerplugin/files/
@ 2018-11-05 19:15 Craig Andrews
0 siblings, 0 replies; 3+ messages in thread
From: Craig Andrews @ 2018-11-05 19:15 UTC (permalink / raw
To: gentoo-commits
commit: cf68742d9375fd12be42f3da94aec4541096c16f
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 19:12:44 2018 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 19:15:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf68742d
www-plugins/freshplayerplugin: Fix building with >=media-video/ffmpeg-4.0
Closes: https://bugs.gentoo.org/654830
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
.../files/freshplayerplugin-0.3.9-ffmpeg-4.patch | 74 ++++++++++++++++++++++
.../freshplayerplugin-0.3.9.ebuild | 8 ++-
2 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/www-plugins/freshplayerplugin/files/freshplayerplugin-0.3.9-ffmpeg-4.patch b/www-plugins/freshplayerplugin/files/freshplayerplugin-0.3.9-ffmpeg-4.patch
new file mode 100644
index 00000000000..15d713bc4e9
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/freshplayerplugin-0.3.9-ffmpeg-4.patch
@@ -0,0 +1,74 @@
+From 934aa9c24d34f8203744b56e4ac6e8599446ca02 Mon Sep 17 00:00:00 2001
+From: Rinat Ibragimov <ibragimovrinat@mail.ru>
+Date: Tue, 26 Dec 2017 16:16:39 +0300
+Subject: [PATCH] ppb_video_decoder: use AV_ prefixed macros
+
+Looks like newer FFmpeg versions have droped old definitions.
+---
+ cmake/ffmpeg-compat/CMakeLists.txt | 1 +
+ cmake/ffmpeg-compat/cfg_avcodecflags.c | 4 ++++
+ cmake/ffmpeg-compat/ffmpeg_compat.h.in | 1 +
+ src/ppb_video_decoder.c | 11 ++++++++---
+ 4 files changed, 14 insertions(+), 3 deletions(-)
+ create mode 100644 cmake/ffmpeg-compat/cfg_avcodecflags.c
+
+diff --git a/cmake/ffmpeg-compat/CMakeLists.txt b/cmake/ffmpeg-compat/CMakeLists.txt
+index 732a71ee..8f67c581 100644
+--- a/cmake/ffmpeg-compat/CMakeLists.txt
++++ b/cmake/ffmpeg-compat/CMakeLists.txt
+@@ -29,6 +29,7 @@ MACRO_C_SOURCE_CHECK(cfg_av_pix_fmt_vdpau.c HAVE_AV_PIX_FMT_VDPAU)
+ MACRO_C_SOURCE_CHECK(cfg_avcodecid.c HAVE_AVCodecID)
+ MACRO_C_SOURCE_CHECK(cfg_avcodeccontext_get_buffer2.c HAVE_AVCodecContext_get_buffer2)
+ MACRO_C_SOURCE_CHECK(cfg_AVVDPAUContext.c HAVE_AVVDPAUContext)
++MACRO_C_SOURCE_CHECK(cfg_avcodecflags.c HAVE_AV_CODEC_FLAGS)
+
+ MACRO_SYMBOL_CHECK(av_frame_alloc "libavcodec/avcodec.h" HAVE_av_frame_alloc)
+ MACRO_SYMBOL_CHECK(av_frame_free "libavcodec/avcodec.h" HAVE_av_frame_free)
+diff --git a/cmake/ffmpeg-compat/cfg_avcodecflags.c b/cmake/ffmpeg-compat/cfg_avcodecflags.c
+new file mode 100644
+index 00000000..d04de55b
+--- /dev/null
++++ b/cmake/ffmpeg-compat/cfg_avcodecflags.c
+@@ -0,0 +1,4 @@
++#include <libavcodec/avcodec.h>
++int main(void) {
++ return AV_CODEC_FLAG_TRUNCATED + AV_CODEC_CAP_TRUNCATED;
++}
+diff --git a/cmake/ffmpeg-compat/ffmpeg_compat.h.in b/cmake/ffmpeg-compat/ffmpeg_compat.h.in
+index dd40922c..da7834b1 100644
+--- a/cmake/ffmpeg-compat/ffmpeg_compat.h.in
++++ b/cmake/ffmpeg-compat/ffmpeg_compat.h.in
+@@ -6,3 +6,4 @@
+ #define HAVE_av_frame_free (@HAVE_av_frame_free@)
+ #define HAVE_avcodec_free_context (@HAVE_avcodec_free_context@)
+ #define HAVE_AVVDPAUContext (@HAVE_AVVDPAUContext@)
++#define HAVE_AV_CODEC_FLAGS (@HAVE_AV_CODEC_FLAGS@)
+diff --git a/src/ppb_video_decoder.c b/src/ppb_video_decoder.c
+index eb150725..23647cdd 100644
+--- a/src/ppb_video_decoder.c
++++ b/src/ppb_video_decoder.c
+@@ -70,6 +70,11 @@
+ #define AV_CODEC_ID_H264 CODEC_ID_H264
+ #endif // !HAVE_AVCodecID
+
++#if !HAVE_AV_CODEC_FLAGS
++#define AV_CODEC_CAP_TRUNCATED CODEC_CAP_TRUNCATED
++#define AV_CODEC_FLAG_TRUNCATED CODEC_FLAG_TRUNCATED
++#endif // !HAVE_AV_CODEC_FLAGS
++
+ enum hwdec_api_e {
+ HWDEC_NONE = 0,
+ HWDEC_VAAPI,
+@@ -620,9 +625,9 @@ initialize_decoder(struct pp_video_decoder_s *vd)
+ goto err;
+ }
+
+- if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) {
+- trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__);
+- vd->avctx->flags |= CODEC_FLAG_TRUNCATED;
++ if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) {
++ trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__);
++ vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED;
+ }
+
+ vd->avctx->opaque = vd;
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
index ea0561a1957..ffb3b7a382c 100644
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -54,7 +54,11 @@ RDEPEND="${COMMON_DEPEND}
www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
"
-PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.9-ioctl.patch" )
+PATCHES=(
+ "${FILESDIR}/0.3.5-cmake.patch"
+ "${FILESDIR}/0.3.9-ioctl.patch"
+ "${FILESDIR}/${P}-ffmpeg-4.patch"
+)
DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-05 19:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-05 19:15 [gentoo-commits] repo/gentoo:master commit in: www-plugins/freshplayerplugin/, www-plugins/freshplayerplugin/files/ Craig Andrews
-- strict thread matches above, loose matches on Subject: below --
2018-01-11 1:09 Brian Evans
2016-10-13 18:14 Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox