| 1 |
hollow 10/08/22 14:06:51 |
| 2 |
|
| 3 |
Added: shotwell-0.6.1-libraw.patch |
| 4 |
Log: |
| 5 |
add missing patch file |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: shotwell-0.6.1-libraw.patch |
| 15 |
=================================================================== |
| 16 |
--- Makefile.orig 2010-07-04 15:54:45.974241667 +0300 |
| 17 |
+++ Makefile 2010-07-04 16:00:10.277241950 +0300 |
| 18 |
@@ -126,7 +126,7 @@ |
| 19 |
FixedKeyFile.vapi \ |
| 20 |
ExtendedPosix.vapi \ |
| 21 |
LConv.vapi \ |
| 22 |
- libraw.vapi \ |
| 23 |
+ libraw_r.vapi \ |
| 24 |
gdk-none.vapi |
| 25 |
|
| 26 |
RESOURCE_FILES = \ |
| 27 |
@@ -196,8 +196,6 @@ |
| 28 |
LConv \ |
| 29 |
gdk-none |
| 30 |
|
| 31 |
-# libraw is not listed (see note below); when libraw-config is no longer needed, it should be |
| 32 |
-# added to this list |
| 33 |
EXT_PKGS = \ |
| 34 |
atk \ |
| 35 |
gdk-2.0 \ |
| 36 |
@@ -205,10 +203,8 @@ |
| 37 |
gtk+-2.0 \ |
| 38 |
libexif \ |
| 39 |
sqlite3 \ |
| 40 |
- gexiv2 |
| 41 |
- |
| 42 |
-LIBRAW_PKG = \ |
| 43 |
- libraw |
| 44 |
+ gexiv2 \ |
| 45 |
+ libraw_r |
| 46 |
|
| 47 |
ifdef LINUX |
| 48 |
EXT_PKGS += \ |
| 49 |
@@ -223,17 +219,13 @@ |
| 50 |
gdk-x11-2.0 |
| 51 |
endif |
| 52 |
|
| 53 |
-# libraw is handled separately (see note below); when libraw-config is no longer needed, the version |
| 54 |
-# should be added to this list |
| 55 |
EXT_PKG_VERSIONS = \ |
| 56 |
gee-1.0 >= 0.5.0 \ |
| 57 |
gtk+-2.0 >= 2.18.0 \ |
| 58 |
libexif >= 0.6.16 \ |
| 59 |
sqlite3 >= 3.5.9 \ |
| 60 |
- gexiv2 >= 0.1.0 |
| 61 |
- |
| 62 |
-LIBRAW_VERSION = \ |
| 63 |
- 0.9.0 |
| 64 |
+ gexiv2 >= 0.1.0 \ |
| 65 |
+ libraw_r >= 0.9.0 |
| 66 |
|
| 67 |
ifdef LINUX |
| 68 |
EXT_PKG_VERSIONS += \ |
| 69 |
@@ -247,7 +239,7 @@ |
| 70 |
dbus-glib-1 >= 0.80 |
| 71 |
endif |
| 72 |
|
| 73 |
-PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG) |
| 74 |
+PKGS = $(EXT_PKGS) $(LOCAL_PKGS) |
| 75 |
|
| 76 |
ifndef BUILD_DIR |
| 77 |
BUILD_DIR=src |
| 78 |
@@ -276,7 +268,7 @@ |
| 79 |
DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \ |
| 80 |
$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \ |
| 81 |
$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \ |
| 82 |
- windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config |
| 83 |
+ windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala |
| 84 |
|
| 85 |
DIST_TAR = $(PROGRAM)-$(VERSION).tar |
| 86 |
DIST_TAR_BZ2 = $(DIST_TAR).bz2 |
| 87 |
@@ -318,14 +310,9 @@ |
| 88 |
CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE |
| 89 |
endif |
| 90 |
|
| 91 |
-# Packaged libraw is not widely available, so we must fake what would be in its .pc file |
| 92 |
-# if not available. |
| 93 |
-ifdef LINUX |
| 94 |
-LIBRAW_CONFIG=./libraw-config |
| 95 |
-endif |
| 96 |
- |
| 97 |
-ifdef WINDOWS |
| 98 |
-LIBRAW_CONFIG=./libraw-config --windows |
| 99 |
+ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r))) |
| 100 |
+# If libraw is built with OpenMP support, we'll need this. |
| 101 |
+CFLAGS += -fopenmp |
| 102 |
endif |
| 103 |
|
| 104 |
$(LANG_STAMP): $(EXPANDED_PO_FILES) |
| 105 |
@@ -447,10 +434,6 @@ |
| 106 |
else ifdef EXT_PKGS |
| 107 |
@pkg-config --print-errors --exists $(EXT_PKGS) |
| 108 |
endif |
| 109 |
-# Check for libraw manually, but not on Windows, where install-deps is used |
| 110 |
-ifndef WINDOWS |
| 111 |
- @$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION) |
| 112 |
-endif |
| 113 |
endif |
| 114 |
@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 ) |
| 115 |
mkdir -p $(BUILD_DIR) |
| 116 |
@@ -468,15 +451,15 @@ |
| 117 |
@ |
| 118 |
|
| 119 |
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile |
| 120 |
- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< |
| 121 |
+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $< |
| 122 |
|
| 123 |
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) |
| 124 |
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ |
| 125 |
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@ |
| 126 |
|
| 127 |
glade: lib$(PROGRAM).so |
| 128 |
|
| 129 |
lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) |
| 130 |
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ |
| 131 |
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@ |
| 132 |
|
| 133 |
shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss |
| 134 |
iscc windows\winstall.iss |
Archives