summaryrefslogtreecommitdiff
path: root/x11/kdelibs4
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-14 13:03:23 +0000
committerwiz <wiz@pkgsrc.org>2014-08-14 13:03:23 +0000
commit96207b7f583351443664b27142ac9ccad2f203f8 (patch)
tree3710756344b4a8a2f9e81f786d8646f6651a6bf6 /x11/kdelibs4
parent5bd36ef02eb73c198cb6d125d92778a7aa63f867 (diff)
downloadpkgsrc-96207b7f583351443664b27142ac9ccad2f203f8.tar.gz
Fix ffmpeg detection.
Bump PKGREVISION.
Diffstat (limited to 'x11/kdelibs4')
-rw-r--r--x11/kdelibs4/Makefile4
-rw-r--r--x11/kdelibs4/distinfo3
-rw-r--r--x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake16
3 files changed, 20 insertions, 3 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 9ee1ea3fa75..b710275e612 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2014/08/11 21:18:03 markd Exp $
+# $NetBSD: Makefile,v 1.73 2014/08/14 13:03:23 wiz Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 01c00bdfa20..226ec7fbc56 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2014/08/11 21:18:03 markd Exp $
+$NetBSD: distinfo,v 1.43 2014/08/14 13:03:23 wiz Exp $
SHA1 (kdelibs-4.11.5.tar.xz) = b4926c62b590e48ac7547bead7e04ef4938d6981
RMD160 (kdelibs-4.11.5.tar.xz) = 9ed91ef6f0860443ec584fdf75adde57d3236682
@@ -14,6 +14,7 @@ SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
+SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 43de2ebe9b553f610185dc2f4add946ab0e660c9
SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = b5f00d1df3c35f499f86aa1d8d234612e8bd130a
SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
SHA1 (patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp) = 3f9cf465db8c1eec3e3a799d9b02e1c9642a4216
diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake
new file mode 100644
index 00000000000..05a243b9058
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.1 2014/08/14 13:03:23 wiz Exp $
+
+Fix detection using pkg-config.
+https://bugs.kde.org/show_bug.cgi?id=338266
+
+--- cmake/modules/FindFFmpeg.cmake.orig 2014-08-14 11:43:40.000000000 +0000
++++ cmake/modules/FindFFmpeg.cmake
+@@ -62,7 +62,7 @@ macro(find_component _component _pkgconf
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+- pkg_check_modules(PC_${_component} ${_pkgconfig})
++ pkg_check_modules(PC_LIB${_component} ${_pkgconfig})
+ endif ()
+ endif (NOT WIN32)
+