diff --git a/srcpkgs/phonon-backend-gstreamer/patches/phonon-gstreamer-gst15_include_dirs.patch b/srcpkgs/phonon-backend-gstreamer/patches/phonon-gstreamer-gst15_include_dirs.patch deleted file mode 100644 index ad8713f93f..0000000000 --- a/srcpkgs/phonon-backend-gstreamer/patches/phonon-gstreamer-gst15_include_dirs.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- cmake/FindGStreamer.cmake.gst15 2014-12-27 08:05:27.000000000 -0600 -+++ cmake/FindGStreamer.cmake 2015-07-06 08:46:39.288178885 -0500 -@@ -2,7 +2,7 @@ - # Once done this will define - # - # GSTREAMER_FOUND - system has GStreamer --# GSTREAMER_INCLUDE_DIR - the GStreamer include directory -+# GSTREAMER_INCLUDE_DIRS - the GStreamer include directory - # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer - # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer - # GSTREAMER_VERSION - the version of GStreamer -@@ -13,12 +13,12 @@ - # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_1.0_FOUND etc) - - --IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) -+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) - # in cache already - SET(GStreamer_FIND_QUIETLY TRUE) --ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) -+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) - SET(GStreamer_FIND_QUIETLY FALSE) --ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) -+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) - - IF (NOT WIN32) - FIND_PACKAGE(PkgConfig REQUIRED) -@@ -28,13 +28,15 @@ IF (NOT WIN32) - PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0) - SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION}) - SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) --ENDIF (NOT WIN32) -- --FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h -+ SET(GSTREAMER_INCLUDE_DIRS ${PKG_GSTREAMER_INCLUDE_DIRS}) -+ELSE (NOT WIN32) -+## FIXME? -+FIND_PATH(GSTREAMER_INCLUDE_DIRS gst/gst.h - PATHS - ${PKG_GSTREAMER_INCLUDE_DIRS} - PATH_SUFFIXES gstreamer-1.0 - ) -+ENDIF (NOT WIN32) - - FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 - PATHS -@@ -51,10 +53,10 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES - ${PKG_GSTREAMER_LIBRARY_DIRS} - ) - --IF (GSTREAMER_INCLUDE_DIR) --ELSE (GSTREAMER_INCLUDE_DIR) -- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") --ENDIF (GSTREAMER_INCLUDE_DIR) -+IF (GSTREAMER_INCLUDE_DIRS) -+ELSE (GSTREAMER_INCLUDE_DIRS) -+ MESSAGE(STATUS "GStreamer: WARNING: include dirs not found") -+ENDIF (GSTREAMER_INCLUDE_DIRS) - - IF (GSTREAMER_LIBRARIES) - ELSE (GSTREAMER_LIBRARIES) -@@ -66,11 +68,11 @@ ELSE (GSTREAMER_APP_LIBRARY) - MESSAGE(STATUS "GStreamer: WARNING: app library not found") - ENDIF (GSTREAMER_APP_LIBRARY) - --IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) -+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) - SET(GSTREAMER_FOUND TRUE) --ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) -+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) - SET(GSTREAMER_FOUND FALSE) --ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) -+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY) - - IF (GSTREAMER_FOUND) - IF (NOT GStreamer_FIND_QUIETLY) -@@ -82,4 +84,4 @@ ELSE (GSTREAMER_FOUND) - ENDIF (GStreamer_FIND_REQUIRED) - ENDIF (GSTREAMER_FOUND) - --MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY) -+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY) ---- gstreamer/CMakeLists.txt.gst15 2015-07-06 08:54:25.613865469 -0500 -+++ gstreamer/CMakeLists.txt 2015-07-06 08:54:28.046921794 -0500 -@@ -15,7 +15,7 @@ - - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} -- ${GSTREAMER_INCLUDE_DIR} -+ ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIRS} - ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR} - ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR} - ${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR} diff --git a/srcpkgs/phonon-backend-gstreamer/template b/srcpkgs/phonon-backend-gstreamer/template index 9a4518cf57..1e94b076c8 100644 --- a/srcpkgs/phonon-backend-gstreamer/template +++ b/srcpkgs/phonon-backend-gstreamer/template @@ -1,7 +1,8 @@ # Template file for 'phonon-backend-gstreamer' pkgname=phonon-backend-gstreamer -version=4.8.1 -revision=3 +version=4.9.0 +revision=1 +wrksrc="phonon-gstreamer-${version}" lib32disabled=yes build_style=cmake hostmakedepends="automoc4 pkg-config extra-cmake-modules" @@ -13,5 +14,9 @@ short_desc="Phonon GStreamer backend" maintainer="Juan RP " license="LGPL-2.1" homepage="http://phonon.kde.org/" -distfiles="http://download.kde.org/stable/phonon/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" -checksum=631a724ad0bbaca3b85cb0f0b82d82e9bcb13498276a52299eb47582602f3b4f +distfiles="http://download.kde.org/stable/phonon/${pkgname}/${version}/${pkgname}-${version}.tar.xz" +checksum=cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt-host-tools phonon-devel" +fi