68 lines
2.8 KiB
Plaintext
68 lines
2.8 KiB
Plaintext
$NetBSD: patch-aa,v 1.9 2011/10/22 13:51:02 gls Exp $
|
|
|
|
--- Makefile.orig 2011-10-13 19:26:06.000000000 +0000
|
|
+++ Makefile
|
|
@@ -273,7 +273,6 @@ EXT_PKGS = \
|
|
gstreamer-base-0.10 \
|
|
gstreamer-pbutils-0.10 \
|
|
gtk+-2.0 \
|
|
- gudev-1.0 \
|
|
libexif \
|
|
libgphoto2 \
|
|
libsoup-2.4 \
|
|
@@ -309,7 +308,6 @@ EXT_PKG_VERSIONS = \
|
|
gstreamer-base-0.10 >= 0.10.28 \
|
|
gstreamer-pbutils-0.10 >= 0.10.32 \
|
|
gtk+-2.0 >= 2.18.0 \
|
|
- gudev-1.0 >= 145 \
|
|
libexif >= 0.6.16 \
|
|
libgphoto2 >= 2.4.2 \
|
|
libsoup-2.4 >= 2.26.0 \
|
|
@@ -434,7 +432,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
|
|
# if not available.
|
|
LIBRAW_CONFIG=./libraw-config
|
|
|
|
-define check_valac_version
|
|
+define xcheck_valac_version
|
|
@ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
|
|
$(if $(MAX_VALAC_VERSION),\
|
|
@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
|
|
@@ -660,7 +658,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
|
|
|
|
# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY
|
|
$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES)
|
|
- $(call check_valac_version)
|
|
@echo Compiling Vala code...
|
|
@mkdir -p $(BUILD_DIR)
|
|
@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
|
|
@@ -677,10 +674,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
|
|
@
|
|
|
|
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
|
|
- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
|
|
+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
|
|
|
|
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
|
|
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
|
|
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
|
|
glib-compile-schemas misc
|
|
|
|
$(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
|
|
@@ -691,7 +688,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
|
|
|
|
.PHONY: $(PLUGINS_DIR)
|
|
$(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
|
|
- $(call check_valac_version)
|
|
@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
|
|
PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
|
|
|
|
@@ -709,7 +705,7 @@ docs:
|
|
glade: lib$(PROGRAM).so
|
|
|
|
lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
|
|
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
|
|
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
|
|
|
|
.PHONY: pkgcheck
|
|
pkgcheck:
|