[gnome-continuous] Build LibRaw from Git instead of a tarball
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Build LibRaw from Git instead of a tarball
- Date: Fri, 12 Feb 2016 18:35:38 +0000 (UTC)
commit 4f13036a3dca8d6863bafce61c971e06dfcea7cc
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Feb 12 18:35:11 2016 +0000
Build LibRaw from Git instead of a tarball
manifest.json | 6 ++--
patches/libraw-autogen.patch | 31 ++++++++++++++++++++++++++++
patches/libraw-pkgconfig.patch | 44 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 6f76775..12dec48 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1226,9 +1226,9 @@
"config-opts": ["--enable-shared", "--disable-static"],
"patches": ["jasper-pkgconfig.patch"]},
- {"src": "tarball:http://www.libraw.org/data/LibRaw-0.17.1.tar.gz";,
- "name": "libraw",
- "checksum": "e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1"},
+ {"src": "git:https://github.com/LibRaw/LibRaw.git";,
+ "config-opts": ["--disable-examples", "--enable-jasper", "--enable-lcms"],
+ "patches": ["libraw-autogen.patch", "libraw-pkgconfig.patch"]},
{"src": "gnome:gegl",
"config-opts": ["--with-jasper"]},
diff --git a/patches/libraw-autogen.patch b/patches/libraw-autogen.patch
new file mode 100644
index 0000000..a506558
--- /dev/null
+++ b/patches/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/patches/libraw-pkgconfig.patch b/patches/libraw-pkgconfig.patch
new file mode 100644
index 0000000..505fdd7
--- /dev/null
+++ b/patches/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
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]