[packages/phonon-backend-vlc] - up to 0.6.2
arekm
arekm at pld-linux.org
Sun Feb 17 18:08:11 CET 2013
commit 1693b7b62d418bdb0714deb29945484fb180fc97
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Feb 17 18:08:08 2013 +0100
- up to 0.6.2
phonon-backend-vlc-FindPhonon.cmake.patch | 65 -------------------------------
phonon-backend-vlc.spec | 8 ++--
2 files changed, 3 insertions(+), 70 deletions(-)
---
diff --git a/phonon-backend-vlc.spec b/phonon-backend-vlc.spec
index ee065d9..baeacb2 100644
--- a/phonon-backend-vlc.spec
+++ b/phonon-backend-vlc.spec
@@ -5,12 +5,12 @@
Summary: VLC backend for Phonon
Summary(pl.UTF-8): Wtyczka VLC dla Phonona
Name: phonon-backend-vlc
-Version: 0.4.1
+Version: 0.6.2
Release: 1
License: LGPL 2.1
Group: X11/Applications
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{name}/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: bdf188c0d3ad3458e7e39ecad06a500b
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{name}/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 1ae8b15594714841d2bcf8c72813a176
#URL: http://
BuildRequires: automoc4 >= 0.9.88
BuildRequires: cmake >= 2.8.0
@@ -21,7 +21,6 @@ BuildRequires: qt4-build >= %{qtver}
BuildRequires: qt4-qmake >= %{qtver}
BuildRequires: vlc-devel >= %{vlcver}
BuildRequires: rpmbuild(macros) >= 1.600
-Patch0: %{name}-FindPhonon.cmake.patch
Provides: qt4-phonon-backend = %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,7 +32,6 @@ Wtyczka VLC dla Phonona.
%prep
%setup -q
-%patch0 -p0
%build
install -d build
diff --git a/phonon-backend-vlc-FindPhonon.cmake.patch b/phonon-backend-vlc-FindPhonon.cmake.patch
deleted file mode 100644
index 896c6f0..0000000
--- a/phonon-backend-vlc-FindPhonon.cmake.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- ./cmake/modules/FindPhonon.cmake.old 2012-02-08 21:25:21.000000000 +0100
-+++ ./cmake/modules/FindPhonon.cmake 2012-02-08 21:25:36.000000000 +0100
-@@ -1,53 +1,18 @@
- # Find Phonon
-
- # Copyright (c) 2010, Harald Sitter <sitter at kde.org>
-+# Copyright (c) 2011, Alexander Neundorf <neundorf at 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()
-+
-+include(FindPackageHandleStandardArgs)
-+
-+find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR )
-+
-
-- if (Phonon_FIND_REQUIRED)
-- set(_req REQUIRED)
-- endif (Phonon_FIND_REQUIRED)
-- if (PHONON_FIND_QUIETLY)
-- set(_quiet QUIET)
-- endif (PHONON_FIND_QUIETLY)
--
-- 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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/phonon-backend-vlc.git/commitdiff/1693b7b62d418bdb0714deb29945484fb180fc97
More information about the pld-cvs-commit
mailing list