Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 244949 Details for
Bug 334821
media-gfx/shotwell-0.7.1 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
shotwell-0.7.1-libraw.patch
shotwell-0.7.1-libraw.patch (text/plain), 3.40 KB, created by
labor_ratte
on 2010-08-27 14:37:24 UTC
(
hide
)
Description:
shotwell-0.7.1-libraw.patch
Filename:
MIME Type:
Creator:
labor_ratte
Created:
2010-08-27 14:37:24 UTC
Size:
3.40 KB
patch
obsolete
>--- Makefile.orig >+++ Makefile >@@ -135,7 +135,7 @@ > FixedKeyFile.vapi \ > ExtendedPosix.vapi \ > LConv.vapi \ >- libraw.vapi \ >+ libraw_r.vapi \ > gdk-none.vapi > > RESOURCE_FILES = \ >@@ -260,8 +260,6 @@ > LConv \ > gdk-none > >-# libraw is not listed (see note below); when libraw-config is no longer needed, it should be >-# added to this list > EXT_PKGS = \ > atk \ > gdk-2.0 \ >@@ -270,10 +268,8 @@ > glib-2.0 \ > libexif \ > sqlite3 \ >- gexiv2 >- >-LIBRAW_PKG = \ >- libraw >+ gexiv2 \ >+ libraw_r > > ifdef LINUX > EXT_PKGS += \ >@@ -288,18 +284,14 @@ > gdk-x11-2.0 > endif > >-# libraw is handled separately (see note below); when libraw-config is no longer needed, the version >-# should be added to this list > EXT_PKG_VERSIONS = \ > gee-1.0 >= 0.5.0 \ > gtk+-2.0 >= 2.18.0 \ > glib-2.0 >= 2.24.0 \ > libexif >= 0.6.16 \ > sqlite3 >= 3.5.9 \ >- gexiv2 >= 0.2.0 >- >-LIBRAW_VERSION = \ >- 0.9.0 >+ gexiv2 >= 0.2.0 \ >+ libraw_r >= 0.9.0 > > ifdef LINUX > EXT_PKG_VERSIONS += \ >@@ -313,7 +305,7 @@ > dbus-glib-1 >= 0.80 > endif > >-PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG) >+PKGS = $(EXT_PKGS) $(LOCAL_PKGS) > > ifndef BUILD_DIR > BUILD_DIR=src >@@ -344,7 +336,7 @@ > DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \ > $(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \ > $(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \ >- windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config \ >+ windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala \ > $(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) > > DIST_TAR = $(PROGRAM)-$(VERSION).tar >@@ -387,14 +379,9 @@ > CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE > endif > >-# Packaged libraw is not widely available, so we must fake what would be in its .pc file >-# if not available. >-ifdef LINUX >-LIBRAW_CONFIG=./libraw-config >-endif >- >-ifdef WINDOWS >-LIBRAW_CONFIG=./libraw-config --windows >+ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r))) >+# If libraw is built with OpenMP support, we'll need this. >+CFLAGS += -fopenmp > endif > > $(LANG_STAMP): $(EXPANDED_PO_FILES) >@@ -525,10 +512,6 @@ > else ifdef EXT_PKGS > @pkg-config --print-errors --exists $(EXT_PKGS) > endif >-# Check for libraw manually, but not on Windows, where install-deps is used >-ifndef WINDOWS >- @$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION) >-endif > endif > @ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 ) > mkdir -p $(BUILD_DIR) >@@ -546,15 +529,15 @@ > @ > > $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile >- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< >+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $< > > $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) >- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ >+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@ > > glade: lib$(PROGRAM).so > > lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) >- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ >+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@ > > shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss > iscc windows\winstall.iss
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 334821
:
244931
|
244933
| 244949 |
245923
|
246820
|
246886