svn commit: r382548 - in head/graphics/shotwell: . files
Thomas Zander
riggs at FreeBSD.org
Sat Mar 28 19:47:09 UTC 2015
Author: riggs
Date: Sat Mar 28 19:47:06 2015
New Revision: 382548
URL: https://svnweb.freebsd.org/changeset/ports/382548
QAT: https://qat.redports.org/buildarchive/r382548/
Log:
- Update to upstream version 0.22.0
- Pet portscout
PR: 198986
Submitted by: cmt at burggraben.net
Modified:
head/graphics/shotwell/Makefile
head/graphics/shotwell/distinfo
head/graphics/shotwell/files/patch-Makefile
head/graphics/shotwell/files/patch-src-camera-CameraTable.vala
head/graphics/shotwell/pkg-plist
Modified: head/graphics/shotwell/Makefile
==============================================================================
--- head/graphics/shotwell/Makefile Sat Mar 28 19:41:43 2015 (r382547)
+++ head/graphics/shotwell/Makefile Sat Mar 28 19:47:06 2015 (r382548)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= shotwell
-PORTVERSION= 0.20.2
-PORTREVISION= 2
+PORTVERSION= 0.22.0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}
@@ -13,7 +12,7 @@ COMMENT= Open source photo manager for G
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala>=0.18.0:${PORTSDIR}/lang/vala \
+BUILD_DEPENDS= vala>=0.20.1:${PORTSDIR}/lang/vala \
bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libgee-0.8.so:${PORTSDIR}/devel/libgee \
@@ -35,17 +34,14 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --disable-icon-update
CONFIGURE_ENV+= --define=NO_CAMERA
INSTALLS_ICONS= yes
+PORTSCOUT= limitw:1,even
OPTIONS_DEFINE= OPENMP
OPTIONS_DEFAULT=
OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+)
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENMP}
-USE_GCC= yes
-LDFLAGS+= -lc++
-.endif
+OPENMP_USES= compiler:gcc-c++11-lib
+OPENMP_USES_OFF= compiler:c++11-lib
SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver
Modified: head/graphics/shotwell/distinfo
==============================================================================
--- head/graphics/shotwell/distinfo Sat Mar 28 19:41:43 2015 (r382547)
+++ head/graphics/shotwell/distinfo Sat Mar 28 19:47:06 2015 (r382548)
@@ -1,2 +1,2 @@
-SHA256 (shotwell-0.20.2.tar.xz) = 37e2c89f75013b8afc045f0b7b4dbbaeca49aa1af3938237ddf4ceac3f6bb740
-SIZE (shotwell-0.20.2.tar.xz) = 1815580
+SHA256 (shotwell-0.22.0.tar.xz) = 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831
+SIZE (shotwell-0.22.0.tar.xz) = 1872952
Modified: head/graphics/shotwell/files/patch-Makefile
==============================================================================
--- head/graphics/shotwell/files/patch-Makefile Sat Mar 28 19:41:43 2015 (r382547)
+++ head/graphics/shotwell/files/patch-Makefile Sat Mar 28 19:47:06 2015 (r382548)
@@ -1,6 +1,15 @@
---- Makefile.orig 2014-09-28 18:41:10.000000000 +0200
-+++ Makefile 2014-09-28 18:43:30.000000000 +0200
-@@ -261,7 +261,6 @@
+--- Makefile.orig 2015-03-28 15:11:25.000000000 +0100
++++ Makefile 2015-03-28 15:14:57.000000000 +0100
+@@ -13,7 +13,7 @@
+ VALAC := $(shell which $(VALAC))
+ endif
+
+-VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
++VALAC_VERSION := `$(VALAC) --version | cut -d' ' -f2`
+ MIN_VALAC_VERSION := 0.20.1
+ INSTALL_PROGRAM := install
+ INSTALL_DATA := install -m 644
+@@ -263,7 +263,6 @@
gstreamer-base-1.0 \
gstreamer-pbutils-1.0 \
gtk+-3.0 \
@@ -8,15 +17,15 @@
libexif \
libgphoto2 \
json-glib-1.0 \
-@@ -293,7 +292,6 @@
+@@ -295,7 +294,6 @@
gstreamer-plugins-base-1.0 >= 1.0.0 \
gstreamer-pbutils-1.0 >= 1.0.0 \
- gtk+-3.0 >= 3.6.0 \
+ gtk+-3.0 >= 3.12.2 \
- gudev-1.0 >= 145 \
libexif >= 0.6.16 \
libgphoto2 >= 2.4.2 \
libraw >= 0.13.2 \
-@@ -543,8 +541,8 @@
+@@ -544,8 +542,8 @@
glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
endif
ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
Modified: head/graphics/shotwell/files/patch-src-camera-CameraTable.vala
==============================================================================
--- head/graphics/shotwell/files/patch-src-camera-CameraTable.vala Sat Mar 28 19:41:43 2015 (r382547)
+++ head/graphics/shotwell/files/patch-src-camera-CameraTable.vala Sat Mar 28 19:47:06 2015 (r382548)
@@ -1,5 +1,5 @@
---- src/camera/CameraTable.vala.orig 2014-09-28 18:49:39.000000000 +0200
-+++ src/camera/CameraTable.vala 2014-09-28 19:10:01.000000000 +0200
+--- src/camera/CameraTable.vala.orig 2015-03-28 15:15:28.000000000 +0100
++++ src/camera/CameraTable.vala 2015-03-28 15:20:51.000000000 +0100
@@ -26,7 +26,6 @@
private static CameraTable instance = null;
@@ -16,10 +16,16 @@
volume_monitor = VolumeMonitor.get();
volume_monitor.volume_changed.connect(on_volume_changed);
volume_monitor.volume_added.connect(on_volume_changed);
-@@ -111,31 +109,7 @@
+@@ -107,36 +105,10 @@
+ do_op(GPhoto.CameraAbilitiesList.create(out abilities_list), "create camera abilities list");
+ do_op(abilities_list.load(null_context), "load camera abilities list");
+ }
+-
++
++ // dummy stub - the original requires udev
private string[] get_all_usb_cameras() {
- string[] cameras = new string[0];
-
+- string[] cameras = new string[0];
+-
- GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
- foreach (GUdev.Device device in device_list) {
- string device_file = device.get_device_file();
@@ -45,14 +51,16 @@
- }
- }
-
-+ // this would require udev, so we'll just return an empty array
- return cameras;
+- return cameras;
++ return new string[0];
}
-@@ -212,23 +186,7 @@
+ // USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera),
+@@ -211,24 +183,8 @@
+ return port.has_prefix("usb:") ?
"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
}
-
+-
- private string? get_name_for_uuid(string uuid) {
- foreach (Volume volume in volume_monitor.get_volumes()) {
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
@@ -62,19 +70,20 @@
- return null;
- }
-
-- private GLib.Icon? get_icon_for_uuid(string uuid) {
+- private string? get_icon_for_uuid(string uuid) {
- foreach (Volume volume in volume_monitor.get_volumes()) {
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
-- return volume.get_icon();
+- return volume.get_icon().to_string();
- }
- }
- return null;
- }
++
+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal)
private void update_camera_table() throws GPhotoError {
// need to do this because virtual ports come and go in the USB world (and probably others)
-@@ -334,22 +292,7 @@
+@@ -334,22 +290,7 @@
}
// Get display name for camera.
@@ -94,14 +103,15 @@
- display_name = device.get_property("ID_MODEL");
- }
- }
-+ // we use a default name, as everything else requires udev
++ // in absence of udev, we fall back to the GPhoto name
if (null == display_name) {
// Default to GPhoto detected name.
display_name = name;
-@@ -394,13 +337,7 @@
+@@ -393,14 +334,8 @@
+ camera_added(camera);
}
}
-
+-
- private void on_udev_event(string action, GUdev.Device device) {
- debug("udev event: %s on %s", action, device.get_name());
-
@@ -109,7 +119,8 @@
- // update to occur when they come in all at once
- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
- }
-+ // on_udev_event() removed as "udev related"
++
++ // on_udev_event() removed - we do not have udev
public void on_volume_changed(Volume volume) {
camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
Modified: head/graphics/shotwell/pkg-plist
==============================================================================
--- head/graphics/shotwell/pkg-plist Sat Mar 28 19:41:43 2015 (r382547)
+++ head/graphics/shotwell/pkg-plist Sat Mar 28 19:47:06 2015 (r382548)
@@ -77,6 +77,82 @@ share/gnome/help/shotwell/C/share-upload
share/gnome/help/shotwell/C/view-displaying.page
share/gnome/help/shotwell/C/view-information.page
share/gnome/help/shotwell/C/view-sidebar.page
+share/gnome/help/shotwell/cs/edit-adjustments.page
+share/gnome/help/shotwell/cs/edit-crop.page
+share/gnome/help/shotwell/cs/edit-enhance.page
+share/gnome/help/shotwell/cs/edit-external.page
+share/gnome/help/shotwell/cs/edit-nondestructive.page
+share/gnome/help/shotwell/cs/edit-redeye.page
+share/gnome/help/shotwell/cs/edit-rotate.page
+share/gnome/help/shotwell/cs/edit-straighten.page
+share/gnome/help/shotwell/cs/edit-time-date.page
+share/gnome/help/shotwell/cs/edit-undo.page
+share/gnome/help/shotwell/cs/formats.page
+share/gnome/help/shotwell/cs/import-camera.page
+share/gnome/help/shotwell/cs/import-f-spot.page
+share/gnome/help/shotwell/cs/import-file.page
+share/gnome/help/shotwell/cs/import-memorycard.page
+share/gnome/help/shotwell/cs/index.page
+share/gnome/help/shotwell/cs/organize-event.page
+share/gnome/help/shotwell/cs/organize-flag.page
+share/gnome/help/shotwell/cs/organize-rating.page
+share/gnome/help/shotwell/cs/organize-remove.page
+share/gnome/help/shotwell/cs/organize-search.page
+share/gnome/help/shotwell/cs/organize-tag.page
+share/gnome/help/shotwell/cs/organize-title.page
+share/gnome/help/shotwell/cs/other-files.page
+share/gnome/help/shotwell/cs/other-missing.page
+share/gnome/help/shotwell/cs/other-multiple.page
+share/gnome/help/shotwell/cs/other-plugins.page
+share/gnome/help/shotwell/cs/raw.page
+share/gnome/help/shotwell/cs/running.page
+share/gnome/help/shotwell/cs/share-background.page
+share/gnome/help/shotwell/cs/share-export.page
+share/gnome/help/shotwell/cs/share-print.page
+share/gnome/help/shotwell/cs/share-send.page
+share/gnome/help/shotwell/cs/share-slideshow.page
+share/gnome/help/shotwell/cs/share-upload.page
+share/gnome/help/shotwell/cs/view-displaying.page
+share/gnome/help/shotwell/cs/view-information.page
+share/gnome/help/shotwell/cs/view-sidebar.page
+share/gnome/help/shotwell/de/edit-adjustments.page
+share/gnome/help/shotwell/de/edit-crop.page
+share/gnome/help/shotwell/de/edit-enhance.page
+share/gnome/help/shotwell/de/edit-external.page
+share/gnome/help/shotwell/de/edit-nondestructive.page
+share/gnome/help/shotwell/de/edit-redeye.page
+share/gnome/help/shotwell/de/edit-rotate.page
+share/gnome/help/shotwell/de/edit-straighten.page
+share/gnome/help/shotwell/de/edit-time-date.page
+share/gnome/help/shotwell/de/edit-undo.page
+share/gnome/help/shotwell/de/formats.page
+share/gnome/help/shotwell/de/import-camera.page
+share/gnome/help/shotwell/de/import-f-spot.page
+share/gnome/help/shotwell/de/import-file.page
+share/gnome/help/shotwell/de/import-memorycard.page
+share/gnome/help/shotwell/de/index.page
+share/gnome/help/shotwell/de/organize-event.page
+share/gnome/help/shotwell/de/organize-flag.page
+share/gnome/help/shotwell/de/organize-rating.page
+share/gnome/help/shotwell/de/organize-remove.page
+share/gnome/help/shotwell/de/organize-search.page
+share/gnome/help/shotwell/de/organize-tag.page
+share/gnome/help/shotwell/de/organize-title.page
+share/gnome/help/shotwell/de/other-files.page
+share/gnome/help/shotwell/de/other-missing.page
+share/gnome/help/shotwell/de/other-multiple.page
+share/gnome/help/shotwell/de/other-plugins.page
+share/gnome/help/shotwell/de/raw.page
+share/gnome/help/shotwell/de/running.page
+share/gnome/help/shotwell/de/share-background.page
+share/gnome/help/shotwell/de/share-export.page
+share/gnome/help/shotwell/de/share-print.page
+share/gnome/help/shotwell/de/share-send.page
+share/gnome/help/shotwell/de/share-slideshow.page
+share/gnome/help/shotwell/de/share-upload.page
+share/gnome/help/shotwell/de/view-displaying.page
+share/gnome/help/shotwell/de/view-information.page
+share/gnome/help/shotwell/de/view-sidebar.page
share/gnome/help/shotwell/el/edit-adjustments.page
share/gnome/help/shotwell/el/edit-crop.page
share/gnome/help/shotwell/el/edit-enhance.page
@@ -201,6 +277,7 @@ share/locale/ast/LC_MESSAGES/shotwell.mo
share/locale/bg/LC_MESSAGES/shotwell.mo
share/locale/bn/LC_MESSAGES/shotwell.mo
share/locale/bn_IN/LC_MESSAGES/shotwell.mo
+share/locale/bs/LC_MESSAGES/shotwell.mo
share/locale/ca/LC_MESSAGES/shotwell.mo
share/locale/cs/LC_MESSAGES/shotwell.mo
share/locale/da/LC_MESSAGES/shotwell.mo
@@ -262,7 +339,6 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.
%%DATADIR%%/icons/crop-pivot-reticle.png
%%DATADIR%%/icons/crop.svg
%%DATADIR%%/icons/drag_nub.png
-%%DATADIR%%/icons/enhance.png
%%DATADIR%%/icons/filter-flagged.png
%%DATADIR%%/icons/filter-photos.png
%%DATADIR%%/icons/filter-raw.png
@@ -293,6 +369,7 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.
%%DATADIR%%/icons/rejected.svg
%%DATADIR%%/icons/shotwell-16.svg
%%DATADIR%%/icons/shotwell-24.svg
+%%DATADIR%%/icons/shotwell-auto-enhance.png
%%DATADIR%%/icons/shotwell-street.jpg
%%DATADIR%%/icons/shotwell.ico
%%DATADIR%%/icons/shotwell.svg
More information about the svn-ports-head
mailing list