From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 26EC31384B4 for ; Wed, 4 Nov 2015 12:26:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D8B021C008; Wed, 4 Nov 2015 12:26:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B6B521C008 for ; Wed, 4 Nov 2015 12:26:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D410B340656 for ; Wed, 4 Nov 2015 12:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 709551F0D for ; Wed, 4 Nov 2015 12:26:14 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1446639963.8bde2c6895dd6bef4c5d7bee86f584b19fcbc080.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/files/, media-libs/qt-gstreamer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild X-VCS-Directories: media-libs/qt-gstreamer/ media-libs/qt-gstreamer/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 8bde2c6895dd6bef4c5d7bee86f584b19fcbc080 X-VCS-Branch: master Date: Wed, 4 Nov 2015 12:26:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 20f1ccd4-63e9-4ff8-8789-3d8172721ab4 X-Archives-Hash: e7af8f8c9941e41434ec615d6c81907b commit: 8bde2c6895dd6bef4c5d7bee86f584b19fcbc080 Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 4 12:25:41 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 4 12:26:03 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bde2c68 media-libs/qt-gstreamer: backport patch from upstream solving build failure with >=media-libs/gstreamer-1.5 Gentoo-bug: 564652 Package-Manager: portage-2.2.20.1 .../files/qt-gstreamer-1.2.0-gstreamer15.patch | 39 ++++++++++++++++++++++ .../qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch new file mode 100644 index 0000000..6e875f6 --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch @@ -0,0 +1,39 @@ +From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= +Date: Fri, 2 Oct 2015 15:00:29 +0300 +Subject: Fix compilation with GStreamer >= 1.5.1 + +apply gstreamer pkg-config definitions To ensure gstreamer builds correctly, +pick up its cflags in FindGstreamer and apply them to the build as definitions + +https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html + +https://bugzilla.gnome.org/show_bug.cgi?id=751382 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d3e7dd..5744015 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,7 @@ find_package(GObject) + macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) + + set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) ++add_definitions(${GSTREAMER_DEFINITIONS}) + include(CheckCXXSourceCompiles) + check_cxx_source_compiles(" + #include +diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index dab91ac..fe6cde1 100644 +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) + exec_program(${PKG_CONFIG_EXECUTABLE} + ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} + OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) ++ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) + endif() + + find_library(GSTREAMER_LIBRARY +-- +cgit v0.10.2 + diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild index a33c8fe..3995ad0 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -53,7 +53,10 @@ DEPEND=" ) " -PATCHES=( "${FILESDIR}/${P}-boost157.patch" ) +PATCHES=( + "${FILESDIR}/${P}-boost157.patch" + "${FILESDIR}/${P}-gstreamer15.patch" +) # bug 497880 RESTRICT="test"