[SCM] kamera packaging branch, master, updated. debian/15.08.2-1-13-g8628c60
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Apr 13 14:17:16 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kamera.git;a=commitdiff;h=8dcf796
The following commit has been merged in the master branch:
commit 8dcf79699f17048674925c4e578278b26b4617fc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Apr 13 15:06:21 2016 +0200
New patch: use_pkgconfig_for_gphoto2.patch
---
debian/patches/series | 1 +
debian/patches/use_pkgconfig_for_gphoto2.patch | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..31e2fee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_pkgconfig_for_gphoto2.patch
diff --git a/debian/patches/use_pkgconfig_for_gphoto2.patch b/debian/patches/use_pkgconfig_for_gphoto2.patch
new file mode 100644
index 0000000..c88a2b1
--- /dev/null
+++ b/debian/patches/use_pkgconfig_for_gphoto2.patch
@@ -0,0 +1,23 @@
+--- a/FindGphoto2.cmake
++++ b/FindGphoto2.cmake
+@@ -47,6 +47,20 @@
+ endforeach()
+
+ set(GPHOTO2_INCLUDE_DIRS ${GPHOTO2PORT_INCLUDE_DIR} ${GPHOTO2_INCLUDE_DIR} )
++ else()
++ find_package(PkgConfig QUIET)
++ PKG_CHECK_MODULES(PC_GPHOTO2 QUIET libgphoto2_port)
++ PKG_CHECK_MODULES(PC_GPHOTO2PORT QUIET libgphoto2)
++
++ foreach(_library ${PC_GPHOTO2PORT_LIBRARIES})
++ set(GPHOTO2_LIBRARIES ${GPHOTO2_LIBRARIES} "-l${_library}")
++ endforeach()
++ foreach(_library ${PC_GPHOTO2_LIBRARIES})
++ set(GPHOTO2_LIBRARIES ${GPHOTO2_LIBRARIES} "-l${_library}")
++ endforeach()
++
++ set(GPHOTO2_INCLUDE_DIRS
++ ${PC_GPHOTO2PORT_INCLUDE_DIRS} ${PC_GPHOTO2_INCLUDE_DIRS})
+
+ endif()
+
--
kamera packaging
More information about the pkg-kde-commits
mailing list