[gnome-apps-nightly] org.gnome.Photos: Fix the LibRaw build by making it Build API compliant
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-apps-nightly] org.gnome.Photos: Fix the LibRaw build by making it Build API compliant
- Date: Tue, 7 Mar 2017 20:14:34 +0000 (UTC)
commit a77cf143fe6e78edf1e89482eec7c26ec302289d
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Mar 7 21:14:05 2017 +0100
org.gnome.Photos: Fix the LibRaw build by making it Build API compliant
Original patch from Emmanuele Bassi for gnome-continuous.
libraw-autogen.patch | 31 +++++++++++++++++++++++++++++++
libraw-pkgconfig.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
org.gnome.Photos.json | 8 ++++++++
3 files changed, 83 insertions(+), 0 deletions(-)
---
diff --git a/libraw-autogen.patch b/libraw-autogen.patch
new file mode 100644
index 0000000..a506558
--- /dev/null
+++ b/libraw-autogen.patch
@@ -0,0 +1,31 @@
+From d5a5d0696a011e97616b68e364360d326cd68e5c Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 12 Feb 2016 18:33:46 +0000
+Subject: [PATCH] Add autogen.sh
+
+Based off of mkdist.sh, but without the deleting of files.
+---
+ autogen.sh | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100755 autogen.sh
+
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..63d7b5e
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++make -f Makefile.devel regenerate
++autoreconf --install
++
++rm -fr dcraw/*
++rm -f dcraw/.gdbinit
++
++cd dcraw
++wget http://www.cybercom.net/~dcoffin/dcraw/dcraw.c
++cd ..
+--
+2.5.0
+
diff --git a/libraw-pkgconfig.patch b/libraw-pkgconfig.patch
new file mode 100644
index 0000000..505fdd7
--- /dev/null
+++ b/libraw-pkgconfig.patch
@@ -0,0 +1,44 @@
+From bf4b0b6a3ec1579916475295ac42a5f98559a04b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 12 Feb 2016 18:29:35 +0000
+Subject: [PATCH] Add pkg-config file to LibRaw
+
+Taken from the Fedora package.
+---
+ libraw.pc.in | 5 +++--
+ libraw_r.pc.in | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libraw.pc.in b/libraw.pc.in
+index 0e530b2..0c635f0 100644
+--- a/libraw.pc.in
++++ b/libraw.pc.in
+@@ -5,7 +5,8 @@ includedir=@includedir@
+
+ Name: libraw
+ Description: Raw image decoder library (non-thread-safe)
+-Requires: @PACKAGE_REQUIRES@
++Requires.private: @PACKAGE_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
++Libs: -L${libdir} -lraw@PC_OPENMP@
++Libs.private: -lstdc++
+ Cflags: -I${includedir}/libraw
+diff --git a/libraw_r.pc.in b/libraw_r.pc.in
+index a7f4535..c4e6028 100644
+--- a/libraw_r.pc.in
++++ b/libraw_r.pc.in
+@@ -5,7 +5,8 @@ includedir=@includedir@
+
+ Name: libraw
+ Description: Raw image decoder library (thread-safe)
+-Requires: @PACKAGE_REQUIRES@
++Requires.private: @PACKAGE_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
++Libs: -L${libdir} -lraw_r@PC_OPENMP@
++Libs.private: -lstdc++
+ Cflags: -I${includedir}/libraw
+--
+2.5.0
+
diff --git a/org.gnome.Photos.json b/org.gnome.Photos.json
index fd4450a..763c496 100644
--- a/org.gnome.Photos.json
+++ b/org.gnome.Photos.json
@@ -134,6 +134,14 @@
{
"type": "git",
"url": "https://github.com/LibRaw/LibRaw.git"
+ },
+ {
+ "type": "patch",
+ "path": "libraw-autogen.patch"
+ },
+ {
+ "type": "patch",
+ "path": "libraw-pkgconfig.patch"
}
]
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]