sergiomb pushed to rawstudio (f21). "Rawstudio from github https://github.com/rawstudio/rawstudio/ . (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 13 16:57:31 UTC 2015
From 22b0d2f951c76fbb9da7dad386bb6c2b09035615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
Date: Wed, 13 May 2015 02:53:56 +0100
Subject: Rawstudio from github https://github.com/rawstudio/rawstudio/ .
- Drop all patches beacuse they are upstreamed.
- https://fedoraproject.org/wiki/Packaging:SourceURL#Github
- Updated requirements.
- Use a parcial copy of autogen.sh to build this package.
diff --git a/.gitignore b/.gitignore
index 2231af0..18e471d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ rawstudio-1.2.tar.gz
/rawstudio.tar.gz
/rawstudio-2.0BETA1.tar.gz
/rawstudio-2.0.tar.gz
+/rawspeed-8ea2a3a6c44ee1c4b370cdd6d7e4ead932fbd307.tar.gz
+/rawstudio-983bda1f0fa5fa86884381208274198a620f006e.tar.gz
diff --git a/0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch b/0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch
deleted file mode 100644
index b9484e8..0000000
--- a/0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cc31d235cd3c4f0adf35614e09965c28175c7c99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
-Date: Tue, 27 Jan 2015 13:30:27 +0000
-Subject: [PATCH] Compile with Lensfun 0.3 version where CCI correction have
- been removed
-
----
- plugins/lensfun/lensfun.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/lensfun/lensfun.c b/plugins/lensfun/lensfun.c
-index af1f189..4f7fffb 100644
---- a/plugins/lensfun/lensfun.c
-+++ b/plugins/lensfun/lensfun.c
-@@ -668,7 +668,7 @@ get_image(RSFilter *filter, const RSFilterRequest *request)
- }
-
- /* Start threads to apply phase 2, Vignetting and CA Correction */
-- if (effective_flags & (LF_MODIFY_VIGNETTING | LF_MODIFY_CCI))
-+ if (effective_flags & LF_MODIFY_VIGNETTING)
- {
- /* Phase 2 is corrected inplace, so copy input first */
- guint y_offset, y_per_thread, threaded_h;
---
-2.3.3
-
diff --git a/rawstudio-2.0-lensfun.patch b/rawstudio-2.0-lensfun.patch
deleted file mode 100644
index fd51bd8..0000000
--- a/rawstudio-2.0-lensfun.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u -r rawstudio-2.0/librawstudio/rs-lens-db-editor.c rawstudio-2.0.new/librawstudio/rs-lens-db-editor.c
---- rawstudio-2.0/librawstudio/rs-lens-db-editor.c 2011-03-27 19:53:27.000000000 +0200
-+++ rawstudio-2.0.new/librawstudio/rs-lens-db-editor.c 2012-07-12 00:42:14.478030487 +0200
-@@ -29,7 +29,7 @@
- #include <gtk/gtk.h>
- #include <string.h>
- #include <config.h>
--#include <lensfun.h>
-+#include <lensfun/lensfun.h>
- #include <rs-lens-db.h>
- #include <rs-lens.h>
- #include <gettext.h>
-Only in rawstudio-2.0.new/librawstudio: .rs-lens-db-editor.c.swp
-diff -u -r rawstudio-2.0/plugins/lensfun/lensfun.c rawstudio-2.0.new/plugins/lensfun/lensfun.c
---- rawstudio-2.0/plugins/lensfun/lensfun.c 2011-03-27 19:53:27.000000000 +0200
-+++ rawstudio-2.0.new/plugins/lensfun/lensfun.c 2012-07-12 00:50:20.360121338 +0200
-@@ -20,7 +20,7 @@
- /* Plugin tmpl version 4 */
-
- #include <rawstudio.h>
--#include <lensfun.h>
-+#include <lensfun/lensfun.h>
- #if defined (__SSE2__)
- #include <emmintrin.h>
- #endif /* __SSE2__ */
-diff -u -r rawstudio-2.0/plugins/lensfun/lensfun-sse2.c rawstudio-2.0.new/plugins/lensfun/lensfun-sse2.c
---- rawstudio-2.0/plugins/lensfun/lensfun-sse2.c 2011-03-27 19:53:27.000000000 +0200
-+++ rawstudio-2.0.new/plugins/lensfun/lensfun-sse2.c 2012-07-12 00:50:07.710067076 +0200
-@@ -20,7 +20,7 @@
- /* Plugin tmpl version 4 */
-
- #include <rawstudio.h>
--#include <lensfun.h>
-+#include <lensfun/lensfun.h>
-
- #if defined (__SSE2__)
-
-diff -u -r rawstudio-2.0/plugins/lensfun/lensfun-version.c rawstudio-2.0.new/plugins/lensfun/lensfun-version.c
---- rawstudio-2.0/plugins/lensfun/lensfun-version.c 2011-03-27 19:53:27.000000000 +0200
-+++ rawstudio-2.0.new/plugins/lensfun/lensfun-version.c 2012-07-12 00:49:54.657011225 +0200
-@@ -44,7 +44,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--#include <lensfun.h>
-+#include <lensfun/lensfun.h>
- #include <stdio.h>
-
- #define __USE_GNU
-diff -u -r rawstudio-2.0/src/application.c rawstudio-2.0.new/src/application.c
---- rawstudio-2.0/src/application.c 2011-04-06 23:30:48.000000000 +0200
-+++ rawstudio-2.0.new/src/application.c 2012-07-12 00:50:52.875261424 +0200
-@@ -53,7 +53,7 @@
- #include "rs-photo.h"
- #include "rs-exif.h"
- #include "rs-library.h"
--#include "lensfun.h"
-+#include <lensfun/lensfun.h>
- #include "rs-profile-factory-model.h"
- #include "rs-profile-camera.h"
-
diff --git a/rawstudio-2.0-libpng.patch b/rawstudio-2.0-libpng.patch
deleted file mode 100644
index 54634ce..0000000
--- a/rawstudio-2.0-libpng.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -u -aur rawstudio-2.0/configure.in rawstudio-2.0.new/configure.in
---- rawstudio-2.0/configure.in 2011-04-07 21:19:01.000000000 +0200
-+++ rawstudio-2.0.new/configure.in 2012-02-28 11:53:25.825452614 +0100
-@@ -83,7 +83,7 @@
- fi
- AC_SUBST(LIBTIFF)
-
--pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
-+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 x11 gthread-2.0 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
-diff -u -aur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.new/plugins/load-gdk/exiv2-colorspace.cpp
---- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-23 23:35:18.000000000 +0100
-+++ rawstudio-2.0.new/plugins/load-gdk/exiv2-colorspace.cpp 2012-02-28 11:19:29.600026282 +0100
-@@ -125,11 +125,17 @@
-
- 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)
- {
-+#if PNG_LIBPNG_VER_SONUM >=15
-+ png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
-+ (png_charpp) &icc_profile_title, &compression_type,
-+ (png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
-+#else
- 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);
-+#endif
- if (retval != 0)
- {
- RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
-diff -u -aur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.new/plugins/output-pngfile/output-pngfile.c
---- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 02:52:29.000000000 +0100
-+++ rawstudio-2.0.new/plugins/output-pngfile/output-pngfile.c 2012-02-28 11:31:50.392934364 +0100
-@@ -23,6 +23,7 @@
- #include <gettext.h>
- #include "config.h"
- #include <png.h>
-+#include <zlib.h>
-
- #define RS_TYPE_PNGFILE (rs_pngfile_type)
- #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
-@@ -197,8 +198,7 @@
- const RSIccProfile *profile = rs_color_space_get_icc_profile(pngfile->color_space, pngfile->save16bit);
- 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, (png_charp)rs_color_space_get_name(pngfile->color_space), PNG_COMPRESSION_TYPE_BASE, (png_charp)data, data_length);
- if (pngfile->save16bit)
- png_set_gAMA(png_ptr, info_ptr, 1.0);
- }
diff --git a/rawstudio.spec b/rawstudio.spec
index 61fc1d4..0c978ed 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -1,31 +1,34 @@
+#https://github.com/rawstudio/rawstudio/commit/983bda1f0fa5fa86884381208274198a620f006e
+%global commit 983bda1f0fa5fa86884381208274198a620f006e
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+#https://github.com/klauspost/rawspeed/tree/8ea2a3a6c44ee1c4b370cdd6d7e4ead932fbd307
+%global commit2 8ea2a3a6c44ee1c4b370cdd6d7e4ead932fbd307
+%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
+
Name: rawstudio
-Version: 2.0
-Release: 19%{?dist}
+Version: 2.1
+Release: 0.1.20150511git%{shortcommit}%{?dist}
Summary: Read, manipulate and convert digital camera raw images
Group: Applications/Multimedia
License: GPLv2+
URL: http://rawstudio.org
-Source0: http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
-# Packaging a snapshot created with
-# svn export -r 3521 https://rawstudio.org/svn/rawstudio/trunk/ rawstudio
-#Source0: rawstudio.tar.gz
-
-BuildRequires: gtk2-devel, libxml2-devel, GConf2-devel, dbus-devel
-BuildRequires: lcms-devel, libjpeg-devel, libtiff-devel, exiv2-devel
-BuildRequires: flickcurl-devel, lensfun-devel, fftw-devel, libcurl-devel
-BuildRequires: sqlite-devel, openssl-devel, gphoto2-devel
+Source0: https://github.com/rawstudio/rawstudio/archive/%{commit}/rawstudio-%{commit}.tar.gz
+#Source0: http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
+# cd plugins/load-rawspeed/rawspeed
+Source1: https://github.com/klauspost/rawspeed/archive/%{commit2}/rawspeed-%{commit2}.tar.gz
+
+BuildRequires: gtk3-devel libxml2-devel GConf2-devel dbus-devel
+BuildRequires: lcms2-devel libjpeg-devel libtiff-devel exiv2-devel
+BuildRequires: lensfun-devel fftw-devel
+# rawstudio disabled support for osm-gps-map
+#BuildRequires: osm-gps-map-devel
+BuildRequires: sqlite-devel gphoto2-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
BuildRequires: libtool autoconf automake
-# FIX FTBS, patch extracted from current code upstream
-Patch0: rawstudio-2.0-libpng.patch
-Patch1: rawstudio-2.0-lensfun.patch
-Patch2: 0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch
-
-
%description
Rawstudio is a highly specialized application for processing RAW images
from digital cameras. It is not a fully featured image editing application.
@@ -55,15 +58,60 @@ Rawstudio backend library
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
+%setup -qn %{name}-%{commit} -a1
+rmdir plugins/load-rawspeed/rawspeed
+mv rawspeed-%{commit2} plugins/load-rawspeed/rawspeed
%build
-autoreconf -vif
-%configure --disable-static
+# I give up ! (sergiomb) this is a copy of autogen.sh, we don't need run all autogen.sh ... only this part.
+for coin in `find $srcdir -name configure.ac -print`
+do
+ dr=`dirname $coin`
+ if test -f $dr/NO-AUTO-GEN; then
+ echo skipping $dr -- flagged as no auto-gen
+ else
+ echo processing $dr
+ ( cd $dr
+
+ aclocalinclude="$ACLOCAL_FLAGS"
+
+ if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Running glib-gettextize... Ignore non-fatal messages."
+ echo "no" | glib-gettextize --force --copy
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ fi
+ if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
+ echo "Running intltoolize..."
+ intltoolize --copy --force --automake
+ fi
+ if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
+ echo "Running xml-i18n-toolize..."
+ xml-i18n-toolize --copy --force --automake
+ fi
+ if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+ if test -z "$NO_LIBTOOLIZE" ; then
+ echo "Running libtoolize..."
+ libtoolize --force --copy
+ fi
+ fi
+ echo "Running aclocal $aclocalinclude ..."
+ aclocal $aclocalinclude
+ if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+ echo "Running autoheader..."
+ autoheader
+ fi
+ echo "Running automake --gnu $am_opt ..."
+ automake --add-missing --gnu $am_opt
+ echo "Running autoconf ..."
+ autoconf
+ )
+ fi
+done
+#autoreconf -vif
+%configure --disable-static --enable-experimental --enable-maintainer-mode
make %{?_smp_mflags}
@@ -71,14 +119,6 @@ make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-# Remove useless files
-find %{buildroot} -name '*.la' -delete
-
-# Fix desktop file warning
-# Note: the Encoding tag seems to be deprecated in desktop entry specs v1.0
-# so this has probably to go away in the future
-echo "Encoding=UTF-8" >> ${RPM_BUILD_ROOT}%{_datadir}/applications/rawstudio.desktop
-
desktop-file-install \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--remove-category Application \
@@ -94,23 +134,32 @@ update-desktop-database &> /dev/null ||:
%files -f %{name}.lang
-%doc README NEWS COPYING AUTHORS
+%doc README.md NEWS COPYING AUTHORS
%{_bindir}/rawstudio
+%{_libdir}/rawstudio
%{_datadir}/rawstudio
%{_datadir}/rawspeed
%{_datadir}/pixmaps/rawstudio
%{_datadir}/applications/*rawstudio.desktop
%{_datadir}/icons/rawstudio.png
+%{_datadir}/appdata/rawstudio.appdata.xml
%files -n librawstudio
-%{_libdir}/librawstudio-2.0.so.*
+%{_libdir}/librawstudio-%{version}.so
%files -n librawstudio-devel
-%{_includedir}/rawstudio-2.0
-%{_libdir}/librawstudio-2.0.so
-%{_libdir}/pkgconfig/rawstudio-2.0.pc
+%{_includedir}/rawstudio-%{version}
+%{_libdir}/librawstudio.so
+%{_libdir}/pkgconfig/rawstudio-%{version}.pc
%changelog
+* Wed May 13 2015 Sérgio Basto <sergio at serjux.com> - 2.1-0.1.20150511git983bda1
+- Rawstudio from github https://github.com/rawstudio/rawstudio/ .
+- Drop all patches beacuse they are upstreamed.
+- https://fedoraproject.org/wiki/Packaging:SourceURL#Github
+- Updated requirements.
+- Use a parcial copy of autogen.sh to build this package.
+
* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 2.0-19
- Rebuilt for GCC 5 C++11 ABI change
diff --git a/sources b/sources
index 7e62314..712ad13 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b2f86b8ca6b83ad954e3104c4cb89e9b rawstudio-2.0.tar.gz
+3a0376a321b7db99005c222efa85db00 rawspeed-8ea2a3a6c44ee1c4b370cdd6d7e4ead932fbd307.tar.gz
+47b4edd8ca4293a73924e8cf93c6921e rawstudio-983bda1f0fa5fa86884381208274198a620f006e.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rawstudio.git/commit/?h=f21&id=22b0d2f951c76fbb9da7dad386bb6c2b09035615
More information about the scm-commits
mailing list