* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/files/, media-libs/phonon-vlc/
@ 2018-02-24 9:48 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-02-24 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 013fee578dab2d361d0ffa239dbf5e31d9b96700
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 20:56:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:48:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013fee57
media-libs/phonon-vlc: 0.10.0 version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/phonon-vlc/Manifest | 1 +
.../files/phonon-vlc-0.10.0-pre-vlc-3.patch | 34 ++++++++++++++++++
media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild | 41 ++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 9080aff8913..e63cd3ba100 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1 +1,2 @@
+DIST phonon-backend-vlc-0.10.0.tar.xz 61080 BLAKE2B 1397bff2791b6baf1de2967aeb5ee1a6d71dcd68cff937bd9d4e2de51d36d8f95db3095a8cbb0786c78b420d3b4a1d0e2e102051cc6458a2267aeea3b2e6aec5 SHA512 cfe2050ac4c9b43fdf33b3cee9d60e5f1e5702aed4b4f14ec915f84578dba08dd5375c2fba6d19817c34197575e29eb9ed5fd816ea753e2bc124d97ea71b0bc8
DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
new file mode 100644
index 00000000000..c670da35738
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
@@ -0,0 +1,34 @@
+From ea4d78ac3fc01f33bc2c0f3fb4a44a4103196da5 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 23 Feb 2018 21:51:45 +0100
+Subject: Fix build with VLC<3
+
+libvlc_title_description_t and libvlc_chapter_description_t are not defined in vlc < 3
+
+Differential Revision: https://phabricator.kde.org/D10775
+---
+ src/mediaplayer.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mediaplayer.h b/src/mediaplayer.h
+index 9d413d4..cd847db 100644
+--- a/src/mediaplayer.h
++++ b/src/mediaplayer.h
+@@ -62,11 +62,13 @@ private:
+ unsigned int m_size;
+ };
+
++#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0))
+ typedef Descriptions<libvlc_title_description_t> TitleDescriptions;
+ typedef QSharedPointer<const TitleDescriptions> SharedTitleDescriptions;
+
+ typedef Descriptions<libvlc_chapter_description_t> ChapterDescriptions;
+ typedef QSharedPointer<ChapterDescriptions> SharedChapterDescriptions;
++#endif
+
+ class MediaPlayer : public QObject
+ {
+--
+cgit v0.11.2
+
+
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
new file mode 100644
index 00000000000..6c36bbe135d
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="phonon-backend-vlc"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+ EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+ inherit git-r3
+fi
+
+inherit cmake-utils
+
+DESCRIPTION="Phonon VLC backend"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ >=media-libs/phonon-4.10.0
+ media-video/vlc:=[dbus,ogg,vorbis]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-pre-vlc-3.patch" )
+
+src_configure() {
+ local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/files/, media-libs/phonon-vlc/
@ 2018-02-27 9:31 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-02-27 9:31 UTC (permalink / raw
To: gentoo-commits
commit: b9984bee2edc819f61a616a8e71fd9ff43842f07
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 09:31:14 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 09:31:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9984bee
media-libs/phonon-vlc: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/phonon-vlc/Manifest | 1 -
.../files/phonon-vlc-0.10.0-pre-vlc-3.patch | 34 ------------------
media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild | 41 ----------------------
3 files changed, 76 deletions(-)
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 89e5113ad9e..707598f4ce6 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,3 +1,2 @@
-DIST phonon-backend-vlc-0.10.0.tar.xz 61080 BLAKE2B 1397bff2791b6baf1de2967aeb5ee1a6d71dcd68cff937bd9d4e2de51d36d8f95db3095a8cbb0786c78b420d3b4a1d0e2e102051cc6458a2267aeea3b2e6aec5 SHA512 cfe2050ac4c9b43fdf33b3cee9d60e5f1e5702aed4b4f14ec915f84578dba08dd5375c2fba6d19817c34197575e29eb9ed5fd816ea753e2bc124d97ea71b0bc8
DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
deleted file mode 100644
index c670da35738..00000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ea4d78ac3fc01f33bc2c0f3fb4a44a4103196da5 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 23 Feb 2018 21:51:45 +0100
-Subject: Fix build with VLC<3
-
-libvlc_title_description_t and libvlc_chapter_description_t are not defined in vlc < 3
-
-Differential Revision: https://phabricator.kde.org/D10775
----
- src/mediaplayer.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/mediaplayer.h b/src/mediaplayer.h
-index 9d413d4..cd847db 100644
---- a/src/mediaplayer.h
-+++ b/src/mediaplayer.h
-@@ -62,11 +62,13 @@ private:
- unsigned int m_size;
- };
-
-+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0))
- typedef Descriptions<libvlc_title_description_t> TitleDescriptions;
- typedef QSharedPointer<const TitleDescriptions> SharedTitleDescriptions;
-
- typedef Descriptions<libvlc_chapter_description_t> ChapterDescriptions;
- typedef QSharedPointer<ChapterDescriptions> SharedChapterDescriptions;
-+#endif
-
- class MediaPlayer : public QObject
- {
---
-cgit v0.11.2
-
-
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
deleted file mode 100644
index 6c36bbe135d..00000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
- EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
- inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- >=media-libs/phonon-4.10.0
- media-video/vlc:=[dbus,ogg,vorbis]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-pre-vlc-3.patch" )
-
-src_configure() {
- local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/files/, media-libs/phonon-vlc/
@ 2018-04-13 23:01 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-04-13 23:01 UTC (permalink / raw
To: gentoo-commits
commit: caa446e5e44d301b301fbcc650ac397db0cf314f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 21:32:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 23:01:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa446e5
media-libs/phonon-vlc: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../files/phonon-vlc-0.10.1-qt-5.11.patch | 32 ++++++++++++++++++++++
media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild | 2 ++
2 files changed, 34 insertions(+)
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
new file mode 100644
index 00000000000..b87a1e17577
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
@@ -0,0 +1,32 @@
+From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 13 Apr 2018 23:16:52 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+Also replace automoc4_add_library with add_library.
+---
+ src/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 47427b2..f91975e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -80,8 +80,12 @@ if(APPLE)
+ video/mac/vlcmacwidget.mm)
+ endif(APPLE)
+
+-automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
+-qt5_use_modules(phonon_vlc Core Widgets)
++add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
++if(PHONON_BUILD_PHONON4QT5)
++ target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets)
++else()
++ target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++endif()
+
+ set_target_properties(phonon_vlc PROPERTIES
+ PREFIX ""
+--
+2.17.0
+
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
index 18a2f10173c..9506df8aba4 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_configure() {
local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/files/, media-libs/phonon-vlc/
@ 2018-12-16 19:30 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 8f8e4d3a59037e34ed579e70ea9651fcbbd6836a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 19:18:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 19:29:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8e4d3a
media-libs/phonon-vlc: Disable vlc screensaver inhibitor, EAPI-7 bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../phonon-vlc-0.10.1-screensaver-inhibitor.patch | 31 ++++++++++++++++++++++
...vlc-9999.ebuild => phonon-vlc-0.10.1-r1.ebuild} | 12 ++++++---
media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 7 ++---
3 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
new file mode 100644
index 00000000000..1e482a027e5
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
@@ -0,0 +1,31 @@
+From cb7c2b74b25380b49b2bb7bbfb7ac3fb37f1cd28 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Tue, 9 Oct 2018 13:22:30 +0200
+Subject: disable the builtin vlc screen saver inhibitor
+
+from a phonon perspective we expect the application to inhibit.
+additionally destructing a player may attempt to uninhibit and block
+on dbus not responding because the call is too late in the lifecycle or
+to an unresponsive remote (all of which the app would ordinarily
+deal with)
+---
+ src/utils/libvlc.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
+index 39e831c..3a33d9a 100644
+--- a/src/utils/libvlc.cpp
++++ b/src/utils/libvlc.cpp
+@@ -90,6 +90,10 @@ bool LibVLC::init()
+ args << "--no-xlib";
+ // Do not preload services discovery modules, we don't use them.
+ args << "--services-discovery=''";
++ // The application is meant to manage this. Also, using the builtin
++ // inhibitor may cause problems on shutdown if VLC tries to uninhibit too
++ // late in the application lifecycle.
++ args << "--no-disable-screensaver";
+ // Allow multiple starts (one gets to wonder whether that makes a difference).
+ #if !defined(Q_OS_MAC) && (defined(Q_OS_WIN) || !defined(PHONON_NO_DBUS))
+ args << "--no-one-instance";
+--
+cgit v1.1
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
similarity index 81%
copy from media-libs/phonon-vlc/phonon-vlc-9999.ebuild
copy to media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
index 18a2f10173c..9c4a65c6754 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="phonon-backend-vlc"
@@ -29,10 +29,16 @@ RDEPEND="
>=media-libs/phonon-4.10.0
media-video/vlc:=[dbus,ogg,vorbis]
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${P}-screensaver-inhibitor.patch"
+)
+
src_configure() {
local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
cmake-utils_src_configure
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 18a2f10173c..0cf441288e1 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="phonon-backend-vlc"
@@ -29,7 +29,8 @@ RDEPEND="
>=media-libs/phonon-4.10.0
media-video/vlc:=[dbus,ogg,vorbis]
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-16 19:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-24 9:48 [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/files/, media-libs/phonon-vlc/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-02-27 9:31 Andreas Sturmlechner
2018-04-13 23:01 Andreas Sturmlechner
2018-12-16 19:30 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox