Update to shotwell 0.8.1:

* Video support for most major video formats
* Publish videos to major Web services, including YouTube, Flickr,
 Facebook, and PicasaWeb.
* Runtime monitoring of library directory and auto-import of newly
 created files.
* Background writing of metadata (tags, titles, ratings, orientation,
 and exposure date) to master files (user-configurable).
* Flagging photos for batch operations.
* Set multiple photos to desktop background slideshow.
* Numerous translation updates.
ok ajacoutot@
This commit is contained in:
landry 2011-01-17 13:05:21 +00:00
parent b0d6ab1adf
commit f49e92521c
6 changed files with 92 additions and 122 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2011/01/07 09:56:24 landry Exp $
# $OpenBSD: Makefile,v 1.4 2011/01/17 13:05:21 landry Exp $
COMMENT = digital photo organizer
DISTNAME = shotwell-0.7.2
REVISION = 0
DISTNAME = shotwell-0.8.1
CATEGORIES = graphics
MASTER_SITES = http://yorba.org/download/shotwell/0.7/
MASTER_SITES = http://yorba.org/download/shotwell/0.8/
HOMEPAGE = http://yorba.org/shotwell/
EXTRACT_SUFX = .tar.bz2
@ -21,7 +20,7 @@ WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
pthread-stubs xcb z ORBit-2 dbus-1 dbus-glib-1 exif \
gconf-2 gnutls gthread-2.0 pthread soup-2.4 sqlite3 usb \
xcb-render xml2 exiv2 stdc++ gee gphoto2 \
xcb-render xml2 exiv2 stdc++ gee gphoto2 gstbase-0.10 gstreamer-0.10 \
gphoto2_port unique-1.0 webkit-1.0 raw gexiv2 gdk-x11-2.0 \
gdk_pixbuf-2.0 gtk-x11-2.0 GL Xxf86vm drm xcb-shm
@ -37,6 +36,7 @@ BUILD_DEPENDS = lang/vala>=0.10
LIB_DEPENDS = x11/gtk+2 \
graphics/libgexiv2 \
graphics/libraw \
devel/json-glib \
www/webkit \
devel/libunique \
devel/libgee \

View File

@ -1,5 +1,5 @@
MD5 (shotwell-0.7.2.tar.bz2) = B1sE+XI73f/8loEDhLlSSg==
RMD160 (shotwell-0.7.2.tar.bz2) = S55qv9pvtHmnyzdjQMIm+hA1foY=
SHA1 (shotwell-0.7.2.tar.bz2) = iSroUumQq5gVEItBuBUe5+9/Edk=
SHA256 (shotwell-0.7.2.tar.bz2) = i0E5QH1Zuty+E+I9sHDgoHCezA+a2AYzWIg4Luv136M=
SIZE (shotwell-0.7.2.tar.bz2) = 1064127
MD5 (shotwell-0.8.1.tar.bz2) = N4Foc1AG3+BzNDHdR/hwxA==
RMD160 (shotwell-0.8.1.tar.bz2) = VvGtkGpCrGrpRaPL11oddpRSxxg=
SHA1 (shotwell-0.8.1.tar.bz2) = smsiLjWhbSzL6VkIU9ZvLpnpyfY=
SHA256 (shotwell-0.8.1.tar.bz2) = lAM0IwCumHq4a+NCunfXXImqo+0N1K+x/vUFvef7Xvw=
SIZE (shotwell-0.8.1.tar.bz2) = 1317586

View File

@ -1,105 +1,55 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
$OpenBSD: patch-Makefile,v 1.2 2011/01/17 13:05:21 landry Exp $
remove gudev requirements
add gmodule to fix http://trac.yorba.org/ticket/2726
--- Makefile.orig Sat Sep 11 00:55:54 2010
+++ Makefile Wed Oct 27 18:49:26 2010
@@ -124,11 +124,6 @@ SRC_FILES = \
FSpotDatabaseDriver.vala \
FSpotDatabaseTables.vala
-ifndef LINUX
-SRC_FILES += \
- GConf.vala
-endif
-
VAPI_FILES = \
libexif.vapi \
libgphoto2.vapi \
@@ -268,6 +263,7 @@ EXT_PKGS = \
gee-1.0 \
--- Makefile.orig Tue Jan 11 00:13:03 2011
+++ Makefile Mon Jan 17 00:52:50 2011
@@ -280,7 +280,6 @@ EXT_PKGS = \
gstreamer-base-0.10 \
gtk+-2.0 \
glib-2.0 \
+ gmodule-2.0 \
libexif \
sqlite3 \
gexiv2
@@ -275,7 +271,6 @@ EXT_PKGS = \
LIBRAW_PKG = \
libraw
-ifdef LINUX
EXT_PKGS += \
gconf-2.0 \
libgphoto2 \
@@ -283,10 +278,8 @@ EXT_PKGS += \
libxml-2.0 \
unique-1.0 \
webkit-1.0 \
- gudev-1.0 \
dbus-glib-1 \
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
@@ -301,7 +294,6 @@ EXT_PKG_VERSIONS = \
LIBRAW_VERSION = \
0.9.0
-ifdef LINUX
EXT_PKG_VERSIONS += \
gconf-2.0 >= 2.22.0 \
libgphoto2 >= 2.4.2 \
@@ -309,9 +301,7 @@ EXT_PKG_VERSIONS += \
libxml-2.0 >= 2.6.32 \
unique-1.0 >= 1.0.0 \
webkit-1.0 >= 1.1.5 \
json-glib-1.0 \
libexif \
libgphoto2 \
@@ -306,7 +305,6 @@ EXT_PKG_VERSIONS = \
glib-2.0 >= 2.24.0 \
gstreamer-0.10 >= 0.10.28 \
gstreamer-base-0.10 >= 0.10.28 \
- gudev-1.0 >= 145 \
dbus-glib-1 >= 0.80
-endif
PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)
@@ -470,7 +460,6 @@ endif
ifndef DISABLE_DESKTOP_UPDATE
-update-desktop-database || :
endif
-ifdef LINUX
ifndef DISABLE_SCHEMAS_INSTALL
GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas
else
@@ -487,7 +476,6 @@ ifndef DISABLE_HELP_INSTALL
mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
endif
-endif
-$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
@@ -518,7 +506,6 @@ endif
json-glib-1.0 >= 0.7.6 \
libexif >= 0.6.16 \
libgphoto2 >= 2.4.2 \
@@ -504,7 +502,6 @@ endif
$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \
$(CONFIG_IN)
- @ ./minver `valac --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' `valac --version` '\b.'; exit 1 )
- @ ./minver `$(VALAC) --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' `$(VALAC) --version` '\b.'; exit 1 )
ifndef ASSUME_PKGS
ifdef EXT_PKG_VERSIONS
@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)'
@@ -546,15 +533,15 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS) $(DIRECT_LIBS_VERSIONS)'
@@ -512,7 +509,7 @@ else 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 )
mkdir -p $(BUILD_DIR)
@@ -530,13 +527,13 @@ $(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 raw` -o $@ $<
+ $(CC) -c $(VALA_CFLAGS) `pkg-config --cflags raw` $(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) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -o $@
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs raw` $(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) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@
shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
iscc windows\winstall.iss

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_CameraTable_vala,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
$OpenBSD: patch-src_CameraTable_vala,v 1.2 2011/01/17 13:05:21 landry Exp $
We don't have gudev.. won't be able to detect cameras
--- src/CameraTable.vala.orig Wed Jun 30 20:44:30 2010
+++ src/CameraTable.vala Thu Jul 1 23:19:30 2010
--- src/CameraTable.vala.orig Tue Jan 11 00:13:03 2011
+++ src/CameraTable.vala Mon Jan 17 00:54:28 2011
@@ -24,7 +24,6 @@ public class CameraTable {
private static CameraTable instance = null;
@ -10,17 +10,16 @@ We don't have gudev.. won't be able to detect cameras
private OneShotScheduler camera_update_scheduler = null;
private GPhoto.Context null_context = new GPhoto.Context();
private GPhoto.CameraAbilitiesList abilities_list;
@@ -40,9 +39,6 @@ public class CameraTable {
@@ -41,8 +40,6 @@ public class CameraTable {
camera_update_scheduler = new OneShotScheduler("CameraTable update scheduler",
on_update_cameras);
- // listen for interesting events on the specified subsystems
- client.uevent.connect(on_udev_event);
-
// because loading the camera abilities list takes a bit of time and slows down app
// startup, delay loading it (and notifying any observers) for a small period of time,
// after the dust has settled
@@ -99,31 +95,6 @@ public class CameraTable {
volume_monitor = VolumeMonitor.get();
volume_monitor.volume_changed.connect(on_volume_changed);
volume_monitor.volume_added.connect(on_volume_changed);
@@ -103,31 +100,6 @@ public class CameraTable {
private string[] get_all_usb_cameras() {
string[] cameras = new string[0];
@ -52,7 +51,28 @@ We don't have gudev.. won't be able to detect cameras
return cameras;
}
@@ -311,13 +282,6 @@ public class CameraTable {
@@ -300,20 +272,6 @@ public class CameraTable {
}
// Get display name for camera.
- string path = get_port_path(port);
- if (null != path) {
- GUdev.Device device = client.query_by_device_file(path);
- string serial = device.get_property("ID_SERIAL_SHORT");
- if (null != serial) {
- display_name = get_name_for_uuid(serial);
- }
- if (null == display_name) {
- display_name = device.get_sysfs_attr("product");
- }
- if (null == display_name) {
- display_name = device.get_property("ID_MODEL");
- }
- }
if (null == display_name) {
// Default to GPhoto detected name.
display_name = name;
@@ -351,13 +309,6 @@ public class CameraTable {
}
}
@ -64,5 +84,5 @@ We don't have gudev.. won't be able to detect cameras
- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
- }
private void on_update_cameras() {
try {
public void on_volume_changed(Volume volume) {
camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_Dialogs_vala,v 1.1 2011/01/07 09:56:25 landry Exp $
Fix with vala 0.10.2
http://trac.yorba.org/changeset/2534
http://trac.yorba.org/ticket/3050
--- src/Dialogs.vala.orig Fri Jan 7 10:49:09 2011
+++ src/Dialogs.vala Fri Jan 7 10:49:23 2011
@@ -1449,7 +1449,7 @@ public class PreferencesDialog {
((FileIcon) app_icon).get_file().get_path()), Resources.DEFAULT_ICON_SCALE,
Gdk.InterpType.BILINEAR, false));
} else if (app_icon is ThemedIcon) {
- unowned Gdk.Pixbuf icon_pixbuf =
+ Gdk.Pixbuf icon_pixbuf =
Gtk.IconTheme.get_default().load_icon(((ThemedIcon) app_icon).get_names()[0],
Resources.DEFAULT_ICON_SCALE, Gtk.IconLookupFlags.FORCE_SIZE);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2011/01/17 13:05:21 landry Exp $
@bin bin/shotwell
share/applications/shotwell-viewer.desktop
share/applications/shotwell.desktop
@ -26,23 +26,26 @@ share/gnome/help/shotwell/C/import-file.page
share/gnome/help/shotwell/C/import-memorycard.page
share/gnome/help/shotwell/C/index.page
share/gnome/help/shotwell/C/organize-event.page
share/gnome/help/shotwell/C/organize-flag.page
share/gnome/help/shotwell/C/organize-rating.page
share/gnome/help/shotwell/C/organize-remove.page
share/gnome/help/shotwell/C/organize-tag.page
share/gnome/help/shotwell/C/organize-title.page
share/gnome/help/shotwell/C/other-files.page
share/gnome/help/shotwell/C/other-missing.page
share/gnome/help/shotwell/C/other-multiple.page
share/gnome/help/shotwell/C/running.page
share/gnome/help/shotwell/C/share-background.page
share/gnome/help/shotwell/C/share-export.page
share/gnome/help/shotwell/C/share-print.page
share/gnome/help/shotwell/C/share-send.page
share/gnome/help/shotwell/C/share-slideshow.page
share/gnome/help/shotwell/C/share-upload.page
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/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/16x16/apps/shotwell.svg
share/icons/hicolor/24x24/apps/shotwell.svg
share/icons/hicolor/scalable/apps/shotwell.svg
share/locale/ar/LC_MESSAGES/shotwell.mo
share/locale/ast/LC_MESSAGES/shotwell.mo
@ -56,9 +59,11 @@ share/locale/el/LC_MESSAGES/shotwell.mo
share/locale/en_GB/LC_MESSAGES/shotwell.mo
share/locale/es/LC_MESSAGES/shotwell.mo
share/locale/et/LC_MESSAGES/shotwell.mo
share/locale/eu/LC_MESSAGES/shotwell.mo
share/locale/fi/LC_MESSAGES/shotwell.mo
share/locale/fr/LC_MESSAGES/shotwell.mo
share/locale/gl/LC_MESSAGES/shotwell.mo
share/locale/he/LC_MESSAGES/shotwell.mo
share/locale/hr/LC_MESSAGES/shotwell.mo
share/locale/hu/LC_MESSAGES/shotwell.mo
share/locale/id/LC_MESSAGES/shotwell.mo
@ -68,11 +73,13 @@ share/locale/kk/LC_MESSAGES/shotwell.mo
share/locale/ko/LC_MESSAGES/shotwell.mo
share/locale/lt/LC_MESSAGES/shotwell.mo
share/locale/lv/LC_MESSAGES/shotwell.mo
share/locale/mk/LC_MESSAGES/shotwell.mo
share/locale/nb/LC_MESSAGES/shotwell.mo
share/locale/nl/LC_MESSAGES/shotwell.mo
share/locale/pa/LC_MESSAGES/shotwell.mo
share/locale/pl/LC_MESSAGES/shotwell.mo
share/locale/pt/LC_MESSAGES/shotwell.mo
share/locale/pt_BR/LC_MESSAGES/shotwell.mo
share/locale/ro/LC_MESSAGES/shotwell.mo
share/locale/ru/LC_MESSAGES/shotwell.mo
share/locale/sk/LC_MESSAGES/shotwell.mo
@ -97,16 +104,18 @@ share/shotwell/icons/drag_nub.png
share/shotwell/icons/enhance.png
share/shotwell/icons/five-star-filter.svg
share/shotwell/icons/five-stars.svg
share/shotwell/icons/flag-page.png
share/shotwell/icons/flag-trinket.png
share/shotwell/icons/four-star-filter-plus.svg
share/shotwell/icons/four-stars.svg
share/shotwell/icons/image-adjust.svg
share/shotwell/icons/import-all.png
share/shotwell/icons/import.svg
share/shotwell/icons/last-import-roll.png
share/shotwell/icons/make-primary.svg
share/shotwell/icons/merge.svg
share/shotwell/icons/multiple-events.png
share/shotwell/icons/multiple-tags.png
share/shotwell/icons/noninterpretable-video.png
share/shotwell/icons/one-event.png
share/shotwell/icons/one-star-filter-plus.svg
share/shotwell/icons/one-star.svg
@ -120,10 +129,12 @@ share/shotwell/icons/shotwell-24.svg
share/shotwell/icons/shotwell-street.jpg
share/shotwell/icons/shotwell.ico
share/shotwell/icons/shotwell.svg
share/shotwell/icons/sprocket.png
share/shotwell/icons/three-star-filter-plus.svg
share/shotwell/icons/three-stars.svg
share/shotwell/icons/two-star-filter-plus.svg
share/shotwell/icons/two-stars.svg
share/shotwell/icons/videos-page.png
share/shotwell/icons/zoom-in.png
share/shotwell/icons/zoom-out.png
share/shotwell/ui/
@ -134,11 +145,15 @@ share/shotwell/ui/events_directory.ui
share/shotwell/ui/fullscreen.ui
share/shotwell/ui/import.ui
share/shotwell/ui/import_queue.ui
share/shotwell/ui/media.ui
share/shotwell/ui/offline.ui
share/shotwell/ui/photo.ui
share/shotwell/ui/set_background_dialog.glade
share/shotwell/ui/shotwell.glade
share/shotwell/ui/tags.ui
share/shotwell/ui/trash.ui
share/shotwell/ui/video.ui
share/shotwell/ui/yandex_publish_model.glade
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/update-desktop-database