85 lines
3.6 KiB
Plaintext
85 lines
3.6 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.6 2011/09/12 18:22:19 jasper Exp $
|
|
|
|
remove gudev requirement
|
|
|
|
--- Makefile.orig Thu Sep 8 20:59:29 2011
|
|
+++ Makefile Mon Sep 12 19:42:54 2011
|
|
@@ -32,7 +32,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv
|
|
LOCAL_LANG_DIR=locale-langpack
|
|
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
|
|
|
|
-VALAFLAGS := -g --enable-checking --thread --fatal-warnings $(USER_VALAFLAGS)
|
|
+VALAFLAGS := -g --enable-checking --thread -X -I${LOCALBASE}/include $(USER_VALAFLAGS)
|
|
ifdef UNITY_SUPPORT
|
|
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
|
|
endif
|
|
@@ -271,7 +271,6 @@ EXT_PKGS = \
|
|
gstreamer-base-0.10 \
|
|
gstreamer-pbutils-0.10 \
|
|
gtk+-2.0 \
|
|
- gudev-1.0 \
|
|
libexif \
|
|
libgphoto2 \
|
|
libsoup-2.4 \
|
|
@@ -307,7 +306,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 \
|
|
@@ -433,9 +431,8 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
|
|
LIBRAW_CONFIG=./libraw-config
|
|
|
|
define check_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 ),)
|
|
+# $(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 ),)
|
|
endef
|
|
|
|
define check_valadate_version
|
|
@@ -554,8 +551,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
|
|
glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
|
|
endif
|
|
ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
|
|
- mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
|
|
- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
|
|
+ mkdir -p $(DESTDIR)$(PREFIX)/share/GConf/gsettings
|
|
+ $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)$(PREFIX)/share/GConf/gsettings
|
|
endif
|
|
ifndef DISABLE_ICON_UPDATE
|
|
-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
|
|
@@ -675,10 +672,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) `pkg-config --cflags raw` $(CFLAGS) -o $@ $<
|
|
|
|
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
|
|
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
|
|
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -o $@
|
|
glib-compile-schemas misc
|
|
|
|
$(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
|
|
@@ -707,7 +704,7 @@ docs:
|
|
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) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@
|
|
|
|
.PHONY: pkgcheck
|
|
pkgcheck:
|
|
@@ -719,6 +716,6 @@ ifdef EXT_PKGS
|
|
@pkg-config --print-errors --exists $(EXT_PKGS) $(DIRECT_LIBS_VERSIONS)
|
|
endif
|
|
# Check for libraw manually
|
|
- @$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
|
|
+ @pkg-config --exists raw
|
|
endif
|
|
@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
|