* [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/, media-libs/qt-gstreamer/files/
@ 2012-03-29 19:13 David Heidelberger
0 siblings, 0 replies; 4+ messages in thread
From: David Heidelberger @ 2012-03-29 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 212b6923f39bd42613bf159673feb152f0c41e73
Author: David Heidelberger <d.okias <AT> gmail <DOT> com>
AuthorDate: Thu Mar 29 19:12:40 2012 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu Mar 29 19:12:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=212b6923
[media-libs/qt-gstreamer-0.10.1] fix build with boost 1.48
(Portage version: 2.1.10.52/git/Linux x86_64, unsigned Manifest commit)
---
.../files/qt-gstreamer-0.10.1-boost.patch | 65 ++++++++++++++++++++
media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild | 4 +
2 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-0.10.1-boost.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-0.10.1-boost.patch
new file mode 100644
index 0000000..7636230
--- /dev/null
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-0.10.1-boost.patch
@@ -0,0 +1,65 @@
+diff --git a/src/QGlib/global.h b/src/QGlib/global.h
+index 314ed02..e73474b 100644
+--- a/src/QGlib/global.h
++++ b/src/QGlib/global.h
+@@ -17,6 +17,11 @@
+ #ifndef QGLIB_GLOBAL_H
+ #define QGLIB_GLOBAL_H
+
++// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
++#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
++#endif
++
+ #include <QtCore/QtGlobal>
+ #include <boost/config.hpp>
+
+diff --git a/src/QGst/Ui/global.h b/src/QGst/Ui/global.h
+index cba1806..85c55ea 100644
+--- a/src/QGst/Ui/global.h
++++ b/src/QGst/Ui/global.h
+@@ -18,6 +18,11 @@
+ #ifndef QTGSTREAMERUI_EXPORT_H
+ #define QTGSTREAMERUI_EXPORT_H
+
++// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
++#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
++#endif
++
+ #include <QtCore/QtGlobal>
+
+ /* defined by cmake when building this library */
+diff --git a/src/QGst/Utils/global.h b/src/QGst/Utils/global.h
+index ed598e6..871c778 100644
+--- a/src/QGst/Utils/global.h
++++ b/src/QGst/Utils/global.h
+@@ -18,6 +18,11 @@
+ #ifndef QGST_UTILS_GLOBAL_H
+ #define QGST_UTILS_GLOBAL_H
+
++// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
++#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
++#endif
++
+ #include <QtCore/QtGlobal>
+
+ /* defined by cmake when building this library */
+diff --git a/src/QGst/global.h b/src/QGst/global.h
+index ae64cfd..cadf3a4 100644
+--- a/src/QGst/global.h
++++ b/src/QGst/global.h
+@@ -17,6 +17,11 @@
+ #ifndef QGST_GLOBAL_H
+ #define QGST_GLOBAL_H
+
++// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
++#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
++#endif
++
+ #include "../QGlib/type.h"
+ #include <QtCore/QtGlobal>
+ #include <QtCore/QDate>
+--
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
index a78f5f1..e31ae36 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
@@ -30,6 +30,10 @@ DEPEND="
${RDEPEND}
"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-boost.patch"
+}
+
src_configure() {
sed -e "s#/lib#/$(get_libdir)#" \
-i src/CMakeLists.txt || die "sed fixing multilib failed"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/, media-libs/qt-gstreamer/files/
@ 2012-04-16 13:30 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2012-04-16 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 29a2c13d84964a1fecd776693d4d0d6a0dca7b20
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 13:00:40 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 13:30:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=29a2c13d
[media-libs/qt-gstreamer] Remove old.
(Portage version: 2.2.0_alpha100/git/Linux i686, unsigned Manifest commit)
---
.../files/qt-gstreamer-0.10.1-boost.patch | 65 --------------------
media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild | 45 --------------
2 files changed, 0 insertions(+), 110 deletions(-)
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-0.10.1-boost.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-0.10.1-boost.patch
deleted file mode 100644
index 7636230..0000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-0.10.1-boost.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/QGlib/global.h b/src/QGlib/global.h
-index 314ed02..e73474b 100644
---- a/src/QGlib/global.h
-+++ b/src/QGlib/global.h
-@@ -17,6 +17,11 @@
- #ifndef QGLIB_GLOBAL_H
- #define QGLIB_GLOBAL_H
-
-+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
-+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include <QtCore/QtGlobal>
- #include <boost/config.hpp>
-
-diff --git a/src/QGst/Ui/global.h b/src/QGst/Ui/global.h
-index cba1806..85c55ea 100644
---- a/src/QGst/Ui/global.h
-+++ b/src/QGst/Ui/global.h
-@@ -18,6 +18,11 @@
- #ifndef QTGSTREAMERUI_EXPORT_H
- #define QTGSTREAMERUI_EXPORT_H
-
-+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
-+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include <QtCore/QtGlobal>
-
- /* defined by cmake when building this library */
-diff --git a/src/QGst/Utils/global.h b/src/QGst/Utils/global.h
-index ed598e6..871c778 100644
---- a/src/QGst/Utils/global.h
-+++ b/src/QGst/Utils/global.h
-@@ -18,6 +18,11 @@
- #ifndef QGST_UTILS_GLOBAL_H
- #define QGST_UTILS_GLOBAL_H
-
-+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
-+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include <QtCore/QtGlobal>
-
- /* defined by cmake when building this library */
-diff --git a/src/QGst/global.h b/src/QGst/global.h
-index ae64cfd..cadf3a4 100644
---- a/src/QGst/global.h
-+++ b/src/QGst/global.h
-@@ -17,6 +17,11 @@
- #ifndef QGST_GLOBAL_H
- #define QGST_GLOBAL_H
-
-+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
-+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include "../QGlib/type.h"
- #include <QtCore/QtGlobal>
- #include <QtCore/QDate>
---
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
deleted file mode 100644
index e31ae36..0000000
--- a/media-libs/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API."
-HOMEPAGE="http://gstreamer.freedesktop.org/wiki/QtGStreamer"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib
- >=media-libs/gstreamer-0.10.31
- >=media-libs/gst-plugins-base-0.10.31
- >=x11-libs/qt-core-4.6
- >=dev-util/automoc-0.9
- >=dev-util/boost-build-1.40
-"
-DEPEND="
- >=dev-util/cmake-2.8
- sys-devel/flex
- sys-devel/bison
- ${RDEPEND}
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-boost.patch"
-}
-
-src_configure() {
- sed -e "s#/lib#/$(get_libdir)#" \
- -i src/CMakeLists.txt || die "sed fixing multilib failed"
-
- sed -e "s#/lib#/$(get_libdir)#" \
- -i elements/CMakeLists.txt || die "sed fixing multilib failed"
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/, media-libs/qt-gstreamer/files/
@ 2015-05-30 11:41 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2015-05-30 11:41 UTC (permalink / raw
To: gentoo-commits
commit: cc2a85965f6be1c55f1f43fbbc4a85420186f8e4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 11:41:15 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 30 11:41:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc2a8596
[media-libs/qt-gstreamer] Add patch to fix build with dev-libs/boost-1.57, bug #550016
Thanks to David Kredba <nheghathivhistha <AT> gmail.com> and Heiko Becker
<heirecka <AT> exherbo.org>.
Package-Manager: portage-2.2.20
.../files/qt-gstreamer-1.2.0-boost157.patch | 34 ++++++++++++++++++++++
media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 2 ++
2 files changed, 36 insertions(+)
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
new file mode 100644
index 0000000..a795420
--- /dev/null
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
@@ -0,0 +1,34 @@
+From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 7 Nov 2014 00:11:02 +0100
+Subject: [PATCH] Workaround build failures with boost>=1.57 and moc
+
+Otherwise I get the following error message:
+'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
+Parse error at "BOOST_JOIN"'. See
+https://bugreports.qt-project.org/browse/QTBUG-22829 for details.
+
+The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+doesn't seem to work here.
+---
+ src/QGlib/connect.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp
+index 9ff6fde..58a3367 100644
+--- a/src/QGlib/connect.cpp
++++ b/src/QGlib/connect.cpp
+@@ -21,8 +21,10 @@
+ #include <QtCore/QHash>
+ #include <QtCore/QMutex>
+ #include <boost/multi_index_container.hpp>
++#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+ #include <boost/multi_index/sequenced_index.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ #include <boost/multi_index/member.hpp>
+
+ namespace QGlib {
+--
+2.1.3
+
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index cbf031f..7a6527c 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -53,6 +53,8 @@ DEPEND="
)
"
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-boost157.patch" )
+
# bug 497880
RESTRICT="test"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/, media-libs/qt-gstreamer/files/
@ 2015-06-11 17:09 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2015-06-11 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 987824056651cf713edc682f454588ad4711b494
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 17:09:39 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 17:09:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98782405
[media-libs/qt-gstreamer] Remove patch, applied upstream
Package-Manager: portage-2.2.20
.../files/qt-gstreamer-1.2.0-boost157.patch | 34 ----------------------
media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 2 --
2 files changed, 36 deletions(-)
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
deleted file mode 100644
index a795420..0000000
--- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 7 Nov 2014 00:11:02 +0100
-Subject: [PATCH] Workaround build failures with boost>=1.57 and moc
-
-Otherwise I get the following error message:
-'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
-Parse error at "BOOST_JOIN"'. See
-https://bugreports.qt-project.org/browse/QTBUG-22829 for details.
-
-The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-doesn't seem to work here.
----
- src/QGlib/connect.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp
-index 9ff6fde..58a3367 100644
---- a/src/QGlib/connect.cpp
-+++ b/src/QGlib/connect.cpp
-@@ -21,8 +21,10 @@
- #include <QtCore/QHash>
- #include <QtCore/QMutex>
- #include <boost/multi_index_container.hpp>
-+#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829
- #include <boost/multi_index/sequenced_index.hpp>
- #include <boost/multi_index/ordered_index.hpp>
-+#endif
- #include <boost/multi_index/member.hpp>
-
- namespace QGlib {
---
-2.1.3
-
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index 7a6527c..cbf031f 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -53,8 +53,6 @@ DEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-boost157.patch" )
-
# bug 497880
RESTRICT="test"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-11 17:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-30 11:41 [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/, media-libs/qt-gstreamer/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-06-11 17:09 Johannes Huber
2012-04-16 13:30 Johannes Huber
2012-03-29 19:13 David Heidelberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox