Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-libs/phonon-gstreamer/ChangeLog13
-rw-r--r--media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch63
-rw-r--r--media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch26
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild54
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild50
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild50
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-r1.ebuild (renamed from media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2.ebuild)4
7 files changed, 41 insertions, 219 deletions
diff --git a/media-libs/phonon-gstreamer/ChangeLog b/media-libs/phonon-gstreamer/ChangeLog
index 7f00f2768fe1..e4cc4657a574 100644
--- a/media-libs/phonon-gstreamer/ChangeLog
+++ b/media-libs/phonon-gstreamer/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for media-libs/phonon-gstreamer
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.22 2012/08/13 08:25:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.23 2012/08/23 11:56:42 johu Exp $
+
+*phonon-gstreamer-4.6.2-r1 (23 Aug 2012)
+
+ 23 Aug 2012; Johannes Huber <johu@gentoo.org>
+ +files/phonon-gstreamer-4.6.2-desktop.patch,
+ +phonon-gstreamer-4.6.2-r1.ebuild,
+ -files/4.5.1-fix-searching-for-phonon.patch, -phonon-gstreamer-4.5.1.ebuild,
+ -phonon-gstreamer-4.6.0.ebuild, -phonon-gstreamer-4.6.1.ebuild,
+ -phonon-gstreamer-4.6.2.ebuild:
+ Revision bump adds upstream patch to fix .desktop validation by Michael
+ Palimaka <kensington@gentoo.org> wrt bug #431602. Remove old.
*phonon-gstreamer-4.6.2 (13 Aug 2012)
diff --git a/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch b/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
deleted file mode 100644
index af9e9c88c8ff..000000000000
--- a/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake
---- phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake 2011-05-04 06:34:52.000000000 +0200
-+++ phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake 2011-12-30 12:22:03.623333200 +0100
-@@ -1,53 +1,16 @@
- # Find Phonon
-
- # Copyright (c) 2010, Harald Sitter <sitter@kde.org>
-+# Copyright (c) 2011, Alexander Neundorf <neundorf@kde.org>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
--if (NOT PHONON_BUILDSYSTEM_DIR)
-- find_program(PC_EXECUTABLE NAMES pkg-config
-- PATH_SUFFIXES bin
-- HINTS
-- ${CMAKE_INSTALL_PREFIX}
-- ONLY_CMAKE_FIND_ROOT_PATH
-- )
--
-- if (NOT PC_EXECUTABLE)
-- if (Phonon_FIND_REQUIRED)
-- message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].")
-- endif (Phonon_FIND_REQUIRED)
-- endif (NOT PC_EXECUTABLE)
--
-- if (PC_EXECUTABLE)
-- execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon
-- OUTPUT_VARIABLE _data_DIR
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
-- file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
-- find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR})
-- endif (PC_EXECUTABLE)
--endif (NOT PHONON_BUILDSYSTEM_DIR)
--
--if (PHONON_BUILDSYSTEM_DIR)
-+find_package(Phonon NO_MODULE)
-+if(PHONON_FOUND)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
-+endif()
-
-- if (Phonon_FIND_REQUIRED)
-- set(_req REQUIRED)
-- endif (Phonon_FIND_REQUIRED)
-- if (PHONON_FIND_QUIETLY)
-- set(_quiet QUIET)
-- endif (PHONON_FIND_QUIETLY)
-+include(FindPackageHandleStandardArgs)
-
-- find_package(PhononInternal ${_req} ${_quiet})
--else (PHONON_BUILDSYSTEM_DIR)
-- if (_data_DIR)
-- if (Phonon_FIND_REQUIRED)
-- message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}")
-- endif (Phonon_FIND_REQUIRED)
-- else (_data_DIR)
-- if (Phonon_FIND_REQUIRED)
-- message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.")
-- endif (Phonon_FIND_REQUIRED)
-- endif (_data_DIR)
--endif (PHONON_BUILDSYSTEM_DIR)
-+find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR )
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch
new file mode 100644
index 000000000000..d7b5b8063add
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch
@@ -0,0 +1,26 @@
+From 4f65f6c1897f4855ed9c765e3cfffa38e25ad149 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sat, 18 Aug 2012 01:15:11 +1000
+Subject: [PATCH] Fix validation of gstreamer.desktop.
+
+REVIEW: 106010
+---
+ gstreamer/gstreamer.desktop.cmake | 2 +-
+ 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+
+diff --git a/gstreamer/gstreamer.desktop.cmake b/gstreamer/gstreamer.desktop.cmake
+index 8192852..523c121 100644
+--- a/gstreamer/gstreamer.desktop.cmake
++++ b/gstreamer/gstreamer.desktop.cmake
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ X-KDE-ServiceTypes=PhononBackend
+-MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;audio/x-ape;
++MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;audio/x-mpegurl;audio/mp3;audio/x-ape;
+ X-KDE-Library=phonon_gstreamer
+ X-KDE-PhononBackendInfo-InterfaceVersion=1
+ X-KDE-PhononBackendInfo-Version=@PHONON_GST_VERSION@
+--
+1.7.12
+
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
deleted file mode 100644
index 745c4ca5d82b..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild,v 1.8 2012/07/25 21:15:59 maekke Exp $
-
-EAPI=4
-
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~x86"
-fi
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
- media-libs/gstreamer
- media-plugins/gst-plugins-meta[alsa?,ogg,vorbis]
- >=media-libs/phonon-4.6.0
- >=x11-libs/qt-core-4.6.0:4[glib]
- >=x11-libs/qt-gui-4.6.0:4[glib]
- >=x11-libs/qt-opengl-4.6.0:4
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup )
-"
-DEPEND="${RDEPEND}
- >=dev-util/automoc-0.9.87
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PV}-fix-searching-for-phonon.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with alsa)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild
deleted file mode 100644
index 57d4ed41caf9..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild,v 1.5 2012/07/25 21:15:59 maekke Exp $
-
-EAPI=4
-
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd"
-fi
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
- media-libs/gstreamer
- media-plugins/gst-plugins-meta[alsa?,ogg,vorbis]
- >=media-libs/phonon-4.6.0
- >=x11-libs/qt-core-4.6.0:4[glib]
- >=x11-libs/qt-gui-4.6.0:4[glib]
- >=x11-libs/qt-opengl-4.6.0:4
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup )
-"
-DEPEND="${RDEPEND}
- >=dev-util/automoc-0.9.87
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with alsa)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild
deleted file mode 100644
index 92f7c007e8ed..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild,v 1.2 2012/07/25 21:15:59 maekke Exp $
-
-EAPI=4
-
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd"
-fi
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
- media-libs/gstreamer
- media-plugins/gst-plugins-meta[alsa?,ogg,vorbis]
- >=media-libs/phonon-4.6.0
- >=x11-libs/qt-core-4.6.0:4[glib]
- >=x11-libs/qt-gui-4.6.0:4[glib]
- >=x11-libs/qt-opengl-4.6.0:4
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup )
-"
-DEPEND="${RDEPEND}
- >=dev-util/automoc-0.9.87
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with alsa)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-r1.ebuild
index 8fc202acb21f..efa9e71ce379 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2.ebuild,v 1.1 2012/08/13 08:25:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-r1.ebuild,v 1.1 2012/08/23 11:56:42 johu Exp $
EAPI=4
@@ -42,6 +42,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with alsa)