diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lensfun-1-lregex.patch | 36 | ||||
-rw-r--r-- | src/lensfun-1-memset.patch (renamed from src/lensfun-2-memset.patch) | 0 | ||||
-rw-r--r-- | src/lensfun.mk | 2 |
3 files changed, 1 insertions, 37 deletions
diff --git a/src/lensfun-1-lregex.patch b/src/lensfun-1-lregex.patch deleted file mode 100644 index e5e58d9..0000000 --- a/src/lensfun-1-lregex.patch +++ /dev/null @@ -1,36 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -http://developer.berlios.de/patch/?func=detailpatch&patch_id=3443&group_id=9034 - -diff -ur lensfun-0.2.7.orig/libs/lensfun/lensfun.mak lensfun-0.2.7/libs/lensfun/lensfun.mak ---- lensfun-0.2.7.orig/libs/lensfun/lensfun.mak 2010-06-21 10:16:59.000000000 +0200 -+++ lensfun-0.2.7/libs/lensfun/lensfun.mak 2013-03-19 16:40:39.204093479 +0100 -@@ -22,4 +22,4 @@ - TARGETS.lensfun-pc = lensfun.pc - SRC.lensfun.pc := $(wildcard libs/lensfun/*.pc.in) config.mak - INSTALL.TARGETS += lensfun-pc --PKGCONFIG.SED.lensfun-pc = -e "s,@CONF_LENSFUN_STATIC@,$(if $(SHAREDLIBS),,-DCONF_LENSFUN_STATIC),g" -+PKGCONFIG.SED.lensfun-pc = -e "s,@NEED_REGEX@,$(if $(NEED_REGEX),-lregex,),g" -e "s,@CONF_LENSFUN_STATIC@,$(if $(SHAREDLIBS),,-DCONF_LENSFUN_STATIC),g" -diff -ur lensfun-0.2.7.orig/libs/lensfun/lensfun.pc.in lensfun-0.2.7/libs/lensfun/lensfun.pc.in ---- lensfun-0.2.7.orig/libs/lensfun/lensfun.pc.in 2010-06-21 10:16:59.000000000 +0200 -+++ lensfun-0.2.7/libs/lensfun/lensfun.pc.in 2013-03-19 16:40:39.204093479 +0100 -@@ -2,5 +2,5 @@ - Description: A photographic lens database and access library - Version: @CONF_VERSION@ - Requires: glib-2.0 --Libs: -L@CONF_LIBDIR@ -llensfun -+Libs: -L@CONF_LIBDIR@ -llensfun @NEED_REGEX@ - Cflags: -I@CONF_INCLUDEDIR@ @CONF_LENSFUN_STATIC@ -diff -ur lensfun-0.2.7.orig/libs/regex/regex.mak lensfun-0.2.7/libs/regex/regex.mak ---- lensfun-0.2.7.orig/libs/regex/regex.mak 2010-03-24 23:47:25.000000000 +0100 -+++ lensfun-0.2.7/libs/regex/regex.mak 2013-03-19 16:40:39.204093479 +0100 -@@ -7,6 +7,7 @@ - SRC.regex$L := $(wildcard libs/regex/*.c) - CFLAGS.regex$L = -DHAVE_SYS_TYPES_H -DTRE_REGEX_T_FIELD=value \ - -DTRE_VERSION="0" -Dinline= -+INSTALL.TARGETS += regex - - ifeq ($(TOOLKIT),GCC) - CFLAGS.regex$L += -Wno-unused-function diff --git a/src/lensfun-2-memset.patch b/src/lensfun-1-memset.patch index 7e91901..7e91901 100644 --- a/src/lensfun-2-memset.patch +++ b/src/lensfun-1-memset.patch diff --git a/src/lensfun.mk b/src/lensfun.mk index 53a9329..4802543 100644 --- a/src/lensfun.mk +++ b/src/lensfun.mk @@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := f26121093dfee85d6371c2c79dae22e6d1b8d0d6 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/lensfun.berlios/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libpng glib +$(PKG)_DEPS := gcc libpng glib libgnurx define $(PKG)_UPDATE $(WGET) -q -O- "http://developer.berlios.de/project/showfiles.php?group_id=9034" | \ |