I managed to build kamoso without manually hacking cache files.

See attached:
From edd037d34e2ed85da8ac94ffc34d79a45c785cf4 Mon Sep 17 00:00:00 2001
From: David Edmundson <[email protected]>
Date: Sat, 18 Jan 2014 16:20:14 +0100
Subject: [PATCH 1/2] Update packageconfig files

---
 src/QGst/QtGStreamer-0.10.pc.in      | 12 ------------
 src/QGst/QtGStreamer-1.0.pc.in       | 12 ++++++++++++
 src/QGst/QtGStreamerUi-0.10.pc.in    | 11 -----------
 src/QGst/QtGStreamerUi-1.0.pc.in     | 11 +++++++++++
 src/QGst/QtGStreamerUtils-0.10.pc.in | 12 ------------
 src/QGst/QtGStreamerUtils-1.0.pc.in  | 12 ++++++++++++
 6 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 src/QGst/QtGStreamer-0.10.pc.in
 create mode 100644 src/QGst/QtGStreamer-1.0.pc.in
 delete mode 100644 src/QGst/QtGStreamerUi-0.10.pc.in
 create mode 100644 src/QGst/QtGStreamerUi-1.0.pc.in
 delete mode 100644 src/QGst/QtGStreamerUtils-0.10.pc.in
 create mode 100644 src/QGst/QtGStreamerUtils-1.0.pc.in

diff --git a/src/QGst/QtGStreamer-0.10.pc.in b/src/QGst/QtGStreamer-0.10.pc.in
deleted file mode 100644
index 9e783cd..0000000
--- a/src/QGst/QtGStreamer-0.10.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDES_INSTALL_DIR@
-
-Name: QtGStreamer-0.10
-Description: Qt-style C++ bindings library for GStreamer
-Requires: QtGLib-2.0
-Requires.private: gstreamer-0.10 gstreamer-interfaces-0.10 gobject-2.0
-Version: @QTGSTREAMER_VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -lQtGStreamer-0.10
diff --git a/src/QGst/QtGStreamer-1.0.pc.in b/src/QGst/QtGStreamer-1.0.pc.in
new file mode 100644
index 0000000..fb3b8a9
--- /dev/null
+++ b/src/QGst/QtGStreamer-1.0.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDES_INSTALL_DIR@
+
+Name: QtGStreamer-1.0
+Description: Qt-style C++ bindings library for GStreamer
+Requires: QtGLib-2.0
+Requires.private: gstreamer-1.0 gstreamer-interfaces-1.0 gobject-2.0
+Version: @QTGSTREAMER_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lQtGStreamer-1.0
diff --git a/src/QGst/QtGStreamerUi-0.10.pc.in b/src/QGst/QtGStreamerUi-0.10.pc.in
deleted file mode 100644
index 04d3fd5..0000000
--- a/src/QGst/QtGStreamerUi-0.10.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDES_INSTALL_DIR@
-
-Name: QtGStreamerUi-0.10
-Description: QtGui GStreamer integration library
-Requires: QtGui QtGStreamer-0.10
-Version: @QTGSTREAMER_VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -lQtGStreamerUi-0.10
diff --git a/src/QGst/QtGStreamerUi-1.0.pc.in b/src/QGst/QtGStreamerUi-1.0.pc.in
new file mode 100644
index 0000000..775879c
--- /dev/null
+++ b/src/QGst/QtGStreamerUi-1.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDES_INSTALL_DIR@
+
+Name: QtGStreamerUi-1.0
+Description: QtGui GStreamer integration library
+Requires: QtGui QtGStreamer-1.0
+Version: @QTGSTREAMER_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lQtGStreamerUi-1.0
diff --git a/src/QGst/QtGStreamerUtils-0.10.pc.in b/src/QGst/QtGStreamerUtils-0.10.pc.in
deleted file mode 100644
index 2254a38..0000000
--- a/src/QGst/QtGStreamerUtils-0.10.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDES_INSTALL_DIR@
-
-Name: QtGStreamerUtils-0.10
-Description: QtGStreamer's high level utility classes
-Requires: QtGStreamer-0.10
-Requires.private: gstreamer-0.10 gstreamer-app-0.10
-Version: @QTGSTREAMER_VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -lQtGStreamerUtils-0.10
diff --git a/src/QGst/QtGStreamerUtils-1.0.pc.in b/src/QGst/QtGStreamerUtils-1.0.pc.in
new file mode 100644
index 0000000..1c99ac1
--- /dev/null
+++ b/src/QGst/QtGStreamerUtils-1.0.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDES_INSTALL_DIR@
+
+Name: QtGStreamerUtils-1.0
+Description: QtGStreamer's high level utility classes
+Requires: QtGStreamer-1.0
+Requires.private: gstreamer-1.0 gstreamer-app-1.0
+Version: @QTGSTREAMER_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lQtGStreamerUtils-1.0
-- 
1.8.5.1

From 4a633aafd1533608895c5697fb564833a88be432 Mon Sep 17 00:00:00 2001
From: David Edmundson <[email protected]>
Date: Sat, 18 Jan 2014 17:34:03 +0100
Subject: [PATCH 2/2] correct cmake file installdir

---
 src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3822449..8ac81ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,9 +56,9 @@ if (QT_QTDECLARATIVE_FOUND)
 endif()
 
 # Install the cmake scripts that are used to find the installed library from external projects
-install(EXPORT ${EXPORT_TARGET_SET} DESTINATION ${LIB_INSTALL_DIR}/QtGStreamer)
+install(EXPORT ${EXPORT_TARGET_SET} DESTINATION ${LIB_INSTALL_DIR}/cmake/QtGStreamer)
 install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindQtGStreamer.cmake
-        DESTINATION ${LIB_INSTALL_DIR}/QtGStreamer
+        DESTINATION ${LIB_INSTALL_DIR}/cmake/QtGStreamer
         RENAME QtGStreamerConfig.cmake)
 
 # Install pkgconfig files
-- 
1.8.5.1

_______________________________________________
KDE-Telepathy mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-telepathy

Reply via email to