Index: graphics/rawstudio/Makefile =================================================================== --- graphics/rawstudio/Makefile (revision 567473) +++ graphics/rawstudio/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= rawstudio PORTVERSION= 2.0 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= graphics MASTER_SITES= http://rawstudio.org/files/release/ @@ -12,27 +12,39 @@ LICENSE= GPLv2 -LIB_DEPENDS= libpng.so:graphics/png \ +BROKEN_powerpc64= fails to link: libicuuc.so. undefined reference to __cxa_throw_bad_array_new_length + +BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 +LIB_DEPENDS= libcurl.so:ftp/curl \ liblcms.so:graphics/lcms \ libexiv2.so:graphics/exiv2 \ libdbus-1.so:devel/dbus \ libfftw3f.so:math/fftw3-float \ + libflickcurl.so:www/flickcurl \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgphoto2.so:graphics/libgphoto2 \ liblensfun.so:graphics/lensfun \ - libflickcurl.so:www/flickcurl \ - libgphoto2.so:graphics/libgphoto2 -BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 + libpng.so:graphics/png \ + libraptor2.so:textproc/raptor2 \ + libtiff.so:graphics/tiff -BROKEN_powerpc64= fails to link: libicuuc.so. undefined reference to __cxa_throw_bad_array_new_length +USES= compiler:c++11-lang desktop-file-utils gmake gnome \ + jpeg libtool localbase pathfix pkgconfig sqlite xorg +USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 libxml2 +USE_LDCONFIG= yes +USE_XORG= x11 -USES= compiler:c++11-lang desktop-file-utils gettext gmake \ - gnome jpeg libtool localbase pathfix pkgconfig sqlite GNU_CONFIGURE= yes -USE_GNOME= gtk20 libxml2 gconf2 -USE_LDCONFIG= yes INSTALL_TARGET= install-strip CXXFLAGS+= -Wno-c++11-narrowing +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +NLS_USES= gettext + post-patch: @${REINPLACE_CMD} -e '/^pkg_modules=/s,libssl,gthread-2.0,' \ ${WRKSRC}/configure Index: graphics/rawstudio/files/patch-exiv2 =================================================================== --- graphics/rawstudio/files/patch-exiv2 (revision 567473) +++ graphics/rawstudio/files/patch-exiv2 (nonexistent) @@ -1,33 +0,0 @@ ---- librawstudio/rs-exif.cc.orig -+++ librawstudio/rs-exif.cc -@@ -21,6 +21,8 @@ - #include - #include - #include -+#include -+#include - #include "rs-exif.h" - #include - #include "rs-library.h" ---- plugins/load-gdk/exiv2-colorspace.cpp.orig -+++ plugins/load-gdk/exiv2-colorspace.cpp -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #include - #include "exiv2-colorspace.h" - #include ---- plugins/meta-exiv2/exiv2-metadata.cpp.orig -+++ plugins/meta-exiv2/exiv2-metadata.cpp -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #include - #include "exiv2-metadata.h" - #include Property changes on: graphics/rawstudio/files/patch-exiv2 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-libpng15 =================================================================== --- graphics/rawstudio/files/patch-libpng15 (revision 567473) +++ graphics/rawstudio/files/patch-libpng15 (nonexistent) @@ -1,35 +0,0 @@ ---- plugins/output-pngfile/output-pngfile.c -+++ plugins/output-pngfile/output-pngfile.c -@@ -23,6 +23,7 @@ - #include - #include "config.h" - #include -+#include - - #define RS_TYPE_PNGFILE (rs_pngfile_type) - #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) -@@ -198,7 +199,7 @@ - rs_icc_profile_get_data(profile, &data, &data_length); - - // FIXME: Insert correct profile name -- png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length); -+ png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length); - if (pngfile->save16bit) - png_set_gAMA(png_ptr, info_ptr, 1.0); - } ---- plugins/load-gdk/exiv2-colorspace.cpp -+++ plugins/load-gdk/exiv2-colorspace.cpp -@@ -125,11 +125,11 @@ - - int compression_type; - /* Extract embedded ICC profile */ -- if (info_ptr->valid & PNG_INFO_iCCP) -+ if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP) - { - png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, - (png_charpp) &icc_profile_title, &compression_type, -- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); -+ (png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size); - if (retval != 0) - { - RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); Property changes on: graphics/rawstudio/files/patch-libpng15 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-librawstudio_rs-exif.cc =================================================================== --- graphics/rawstudio/files/patch-librawstudio_rs-exif.cc (nonexistent) +++ graphics/rawstudio/files/patch-librawstudio_rs-exif.cc (working copy) @@ -0,0 +1,11 @@ +--- librawstudio/rs-exif.cc.orig 2011-02-15 17:28:05 UTC ++++ librawstudio/rs-exif.cc +@@ -21,6 +21,8 @@ + #include + #include + #include ++#include ++#include + #include "rs-exif.h" + #include + #include "rs-library.h" Property changes on: graphics/rawstudio/files/patch-librawstudio_rs-exif.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-librawstudio_rs-macros.h =================================================================== --- graphics/rawstudio/files/patch-librawstudio_rs-macros.h (nonexistent) +++ graphics/rawstudio/files/patch-librawstudio_rs-macros.h (working copy) @@ -0,0 +1,17 @@ +--- librawstudio/rs-macros.h.orig 2011-02-15 17:28:05 UTC ++++ librawstudio/rs-macros.h +@@ -51,12 +51,12 @@ + #if __GNUC__ >= 3 + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +-#define align(x) __attribute__ ((aligned (x))) ++// #define align(x) __attribute__ ((aligned (x))) + #define __deprecated __attribute__ ((deprecated)) + #else + #define likely(x) (x) + #define unlikely(x) (x) +-#define align(x) ++// #define align(x) + #define __deprecated + #endif + Property changes on: graphics/rawstudio/files/patch-librawstudio_rs-macros.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp =================================================================== --- graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp (revision 567473) +++ graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp (working copy) @@ -1,6 +1,6 @@ --- plugins/denoise/fftwindow.cpp.orig 2011-02-15 17:28:03 UTC +++ plugins/denoise/fftwindow.cpp -@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( +@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( FloatImagePlan if ((uintptr_t)src1 & 15) { asm volatile ( @@ -9,7 +9,7 @@ "prefetchnta (%4)\n" // Prefetch next line (Used once only, so don't pollute cache) "movups (%1), %%xmm0\n" // src1 pt1 "movups 16(%1), %%xmm1\n" // src1 pt2 -@@ -193,7 +193,7 @@ void FFTWindow::applyAnalysisWindowSSE( +@@ -193,7 +193,7 @@ void FFTWindow::applyAnalysisWindowSSE( FloatImagePlan "add $64, %2\n" "add $64, %4\n" "dec %3\n" @@ -18,7 +18,7 @@ : /* no output registers */ : "r" (analysis.getLine(y)), "r" (src1), "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch]) -@@ -202,7 +202,7 @@ void FFTWindow::applyAnalysisWindowSSE( +@@ -202,7 +202,7 @@ void FFTWindow::applyAnalysisWindowSSE( FloatImagePlan } else { asm volatile ( @@ -27,7 +27,7 @@ "prefetchnta (%4)\n" // Prefetch next line (Used once only, so don't pollute cache) "movaps (%1), %%xmm0\n" // src1 pt1 "movaps 16(%1), %%xmm1\n" // src1 pt2 -@@ -221,7 +221,7 @@ void FFTWindow::applyAnalysisWindowSSE( +@@ -221,7 +221,7 @@ void FFTWindow::applyAnalysisWindowSSE( FloatImagePlan "add $64, %2\n" "add $64, %4\n" "dec %3\n" Index: graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc =================================================================== --- graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc (revision 567473) +++ graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc (working copy) @@ -1,4 +1,4 @@ ---- plugins/load-dcraw/dcraw.cc.orig 2015-05-29 01:03:46 UTC +--- plugins/load-dcraw/dcraw.cc.orig 2011-02-15 17:28:03 UTC +++ plugins/load-dcraw/dcraw.cc @@ -869,7 +869,8 @@ struct jhead { Index: graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp =================================================================== --- graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp (nonexistent) +++ graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp (working copy) @@ -0,0 +1,25 @@ +--- plugins/load-gdk/exiv2-colorspace.cpp.orig 2011-02-23 22:35:18 UTC ++++ plugins/load-gdk/exiv2-colorspace.cpp +@@ -22,6 +22,8 @@ + #include + #include + #include ++#include ++#include + #include + #include "exiv2-colorspace.h" + #include +@@ -125,11 +127,11 @@ jpeg_fail: + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, + (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ (png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); Property changes on: graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp =================================================================== --- graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp (nonexistent) +++ graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp (working copy) @@ -0,0 +1,11 @@ +--- plugins/meta-exiv2/exiv2-metadata.cpp.orig 2011-02-26 23:13:39 UTC ++++ plugins/meta-exiv2/exiv2-metadata.cpp +@@ -22,6 +22,8 @@ + #include + #include + #include ++#include ++#include + #include + #include "exiv2-metadata.h" + #include Property changes on: graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c =================================================================== --- graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c (nonexistent) +++ graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c (working copy) @@ -0,0 +1,20 @@ +--- plugins/output-pngfile/output-pngfile.c.orig 2011-03-26 01:52:29 UTC ++++ plugins/output-pngfile/output-pngfile.c +@@ -23,6 +23,7 @@ + #include + #include "config.h" + #include ++#include + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) +@@ -198,7 +199,8 @@ execute(RSOutput *output, RSFilter *filter) + rs_icc_profile_get_data(profile, &data, &data_length); + + // FIXME: Insert correct profile name +- png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length); ++png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length); ++ png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length); + if (pngfile->save16bit) + png_set_gAMA(png_ptr, info_ptr, 1.0); + } Property changes on: graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-rs-macros.h =================================================================== --- graphics/rawstudio/files/patch-rs-macros.h (revision 567473) +++ graphics/rawstudio/files/patch-rs-macros.h (nonexistent) @@ -1,16 +0,0 @@ ---- librawstudio/rs-macros.h 2014-02-19 06:34:15.000000000 +0100 -+++ librawstudio/rs-macros.h 2014-02-19 06:34:21.000000000 +0100 -@@ -51,12 +51,12 @@ - #if __GNUC__ >= 3 - #define likely(x) __builtin_expect (!!(x), 1) - #define unlikely(x) __builtin_expect (!!(x), 0) --#define align(x) __attribute__ ((aligned (x))) -+// #define align(x) __attribute__ ((aligned (x))) - #define __deprecated __attribute__ ((deprecated)) - #else - #define likely(x) (x) - #define unlikely(x) (x) --#define align(x) -+// #define align(x) - #define __deprecated - #endif Property changes on: graphics/rawstudio/files/patch-rs-macros.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-rs-tag-gui.c =================================================================== --- graphics/rawstudio/files/patch-rs-tag-gui.c (revision 567473) +++ graphics/rawstudio/files/patch-rs-tag-gui.c (nonexistent) @@ -1,26 +0,0 @@ ---- src/rs-tag-gui.c.orig 2011-02-15 18:28:05.000000000 +0100 -+++ src/rs-tag-gui.c 2014-02-14 18:36:48.000000000 +0100 -@@ -93,11 +93,6 @@ - return box; - } - --GtkWidget * --rs_library_tag_entry_new(RSLibrary *library) --{ -- g_assert(RS_IS_LIBRARY(library)); -- - gboolean - selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) - { -@@ -179,6 +174,11 @@ - return found; - } - -+GtkWidget * -+rs_library_tag_entry_new(RSLibrary *library) -+{ -+ g_assert(RS_IS_LIBRARY(library)); -+ - GtkWidget *entry = gtk_entry_new(); - GtkEntryCompletion *completion = gtk_entry_completion_new(); - GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING); Property changes on: graphics/rawstudio/files/patch-rs-tag-gui.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/rawstudio/files/patch-src_rs-tag-gui.c =================================================================== --- graphics/rawstudio/files/patch-src_rs-tag-gui.c (nonexistent) +++ graphics/rawstudio/files/patch-src_rs-tag-gui.c (working copy) @@ -0,0 +1,26 @@ +--- src/rs-tag-gui.c.orig 2011-02-15 17:28:05 UTC ++++ src/rs-tag-gui.c +@@ -93,11 +93,6 @@ rs_tag_gui_toolbox_new(RSLibrary *library, RSStore *st + return box; + } + +-GtkWidget * +-rs_library_tag_entry_new(RSLibrary *library) +-{ +- g_assert(RS_IS_LIBRARY(library)); +- + gboolean + selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) + { +@@ -178,6 +173,11 @@ rs_library_tag_entry_new(RSLibrary *library) + + return found; + } ++ ++GtkWidget * ++rs_library_tag_entry_new(RSLibrary *library) ++{ ++ g_assert(RS_IS_LIBRARY(library)); + + GtkWidget *entry = gtk_entry_new(); + GtkEntryCompletion *completion = gtk_entry_completion_new(); Property changes on: graphics/rawstudio/files/patch-src_rs-tag-gui.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property