Accepting request 109573 from graphics
removed darktable-fix-deprecation.patch and gconf depends kept source package as it is, not converted to bzip2 - Upgrade to release 1.0 + new cameras supported * Leica M9 * NX100/NX5/NX10/NX11 * Panasonic DMC-GX1 * Pentax K-r * Canon Powershot S100 * Olympus XZ-1 * Olympus E-P3 * Sony DSLR A330 * Sony NEX-5N * Canon EOS 1000D * Canon EOS 600D * Sony Alpha 390 * Fuji Finepix HS20EXR + new and updated translations (we now have chinese!) + new image cache * faster concurrent access and insertion * reduces needed memory * more thumbnails stored on disk * read embedded jpegs for creating thumbnails (faster folder import) + increased general speed on sqlite3 (journaled, pagesize optimizations) + reworked, modular ui + keyboard shortcuts support - key accelerators (GSoC) + quicktool bar: exposure, presets and styles + new color picker + web gallery export now with next/prev buttons per image + removed gconf: not used anymore, we have our own backend (forwarded request 109474 from toganm) OBS-URL: https://build.opensuse.org/request/show/109573 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=11
This commit is contained in:
parent
3b0c2dcd65
commit
b47c6e51e2
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:6feb2c82b81df7f527c04c051b71dca8c75d47a2eb73ce25106fa268f4ee5344
|
|
||||||
size 1849653
|
|
3
darktable-1.0.tar.gz
Normal file
3
darktable-1.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:75e2a1905dc262d771a0064b461b4419a6dc914776ed18cc6a45b8294c175b72
|
||||||
|
size 2535774
|
@ -1,46 +0,0 @@
|
|||||||
From 2449428b79acb5313f316095e757a19573bf473e Mon Sep 17 00:00:00 2001
|
|
||||||
From: johannes hanika <hanatos@gmail.com>
|
|
||||||
Date: Tue, 7 Feb 2012 21:26:53 +1300
|
|
||||||
Subject: [PATCH] tried to work around g_thread_init() deprecation.
|
|
||||||
|
|
||||||
---
|
|
||||||
src/common/pwstorage/backend_kwallet.c | 4 ++++
|
|
||||||
src/gui/gtk.c | 4 ++++
|
|
||||||
2 files changed, 8 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
Index: darktable-0.9.3/src/common/pwstorage/backend_kwallet.c
|
|
||||||
===================================================================
|
|
||||||
--- darktable-0.9.3.orig/src/common/pwstorage/backend_kwallet.c
|
|
||||||
+++ darktable-0.9.3/src/common/pwstorage/backend_kwallet.c
|
|
||||||
@@ -201,10 +201,14 @@ const backend_kwallet_context_t* dt_pwst
|
|
||||||
// NULL the context
|
|
||||||
memset(_context, 0, sizeof(backend_kwallet_context_t));
|
|
||||||
|
|
||||||
+#if GLIB_MAJOR_VERSION <= 2
|
|
||||||
+#if GLIB_MINOR_VERSION < 31
|
|
||||||
// Initialize threading in dbus-glib - it should be fine for
|
|
||||||
// dbus_g_thread_init to be called multiple times.
|
|
||||||
if (!g_thread_supported())
|
|
||||||
g_thread_init(NULL);
|
|
||||||
+#endif
|
|
||||||
+#endif
|
|
||||||
dbus_g_thread_init();
|
|
||||||
|
|
||||||
GError* error = NULL;
|
|
||||||
Index: darktable-0.9.3/src/gui/gtk.c
|
|
||||||
===================================================================
|
|
||||||
--- darktable-0.9.3.orig/src/gui/gtk.c
|
|
||||||
+++ darktable-0.9.3/src/gui/gtk.c
|
|
||||||
@@ -1211,8 +1211,12 @@ dt_gui_gtk_init(dt_gui_gtk_t *gui, int a
|
|
||||||
memset(gui->snapshot, 0, sizeof(gui->snapshot));
|
|
||||||
for(int k=0; k<4; k++) snprintf(gui->snapshot[k].filename, 30, "/tmp/dt_snapshot_%d.png", k);
|
|
||||||
gui->presets_popup_menu = NULL;
|
|
||||||
+#if GLIB_MAJOR_VERSION <= 2
|
|
||||||
+#if GLIB_MINOR_VERSION < 31
|
|
||||||
if (!g_thread_supported ()) g_thread_init(NULL);
|
|
||||||
gdk_threads_init();
|
|
||||||
+#endif
|
|
||||||
+#endif
|
|
||||||
gdk_threads_enter();
|
|
||||||
gtk_init (&argc, &argv);
|
|
||||||
|
|
@ -1,4 +1,41 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 15 07:52:17 UTC 2012 - toganm@opensuse.org
|
||||||
|
|
||||||
|
- Upgrade to release 1.0
|
||||||
|
+ new cameras supported
|
||||||
|
* Leica M9
|
||||||
|
* NX100/NX5/NX10/NX11
|
||||||
|
* Panasonic DMC-GX1
|
||||||
|
* Pentax K-r
|
||||||
|
* Canon Powershot S100
|
||||||
|
* Olympus XZ-1
|
||||||
|
* Olympus E-P3
|
||||||
|
* Sony DSLR A330
|
||||||
|
* Sony NEX-5N
|
||||||
|
* Canon EOS 1000D
|
||||||
|
* Canon EOS 600D
|
||||||
|
* Sony Alpha 390
|
||||||
|
* Fuji Finepix HS20EXR
|
||||||
|
+ new and updated translations (we now have chinese!)
|
||||||
|
+ new image cache
|
||||||
|
* faster concurrent access and insertion
|
||||||
|
* reduces needed memory
|
||||||
|
* more thumbnails stored on disk
|
||||||
|
* read embedded jpegs for creating thumbnails (faster folder
|
||||||
|
import)
|
||||||
|
+ increased general speed on sqlite3 (journaled, pagesize
|
||||||
|
optimizations)
|
||||||
|
+ reworked, modular ui
|
||||||
|
+ keyboard shortcuts support - key accelerators (GSoC)
|
||||||
|
+ quicktool bar: exposure, presets and styles
|
||||||
|
+ new color picker
|
||||||
|
+ web gallery export now with next/prev buttons per image
|
||||||
|
+ removed gconf: not used anymore, we have our own backend
|
||||||
|
+ bugfixes
|
||||||
|
+ there have been issues with memory on 32-bit systems. seems to
|
||||||
|
be okay currently, but something to keep in mind. use 64-bits
|
||||||
|
if you can
|
||||||
|
-------------------------------------------------------------------
|
||||||
Tue Feb 28 12:06:27 UTC 2012 - fcrozat@suse.com
|
Tue Feb 28 12:06:27 UTC 2012 - fcrozat@suse.com
|
||||||
|
|
||||||
- Add darktable-fix-deprecation.patch to fix glib deprecation.
|
- Add darktable-fix-deprecation.patch to fix glib deprecation.
|
||||||
|
@ -17,12 +17,10 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: darktable
|
Name: darktable
|
||||||
Version: 0.9.3
|
Version: 1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: http://darktable.sourceforge.net
|
Url: http://darktable.sourceforge.net
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM darktable-fix-deprecation.patch fcrozat@suse.com -- fix glib deprecation (git)
|
|
||||||
Patch0: darktable-fix-deprecation.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: Mesa-devel
|
BuildRequires: Mesa-devel
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
@ -30,7 +28,6 @@ BuildRequires: cmake
|
|||||||
BuildRequires: dbus-1-glib-devel
|
BuildRequires: dbus-1-glib-devel
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gconf2-devel
|
|
||||||
BuildRequires: gnome-keyring-devel
|
BuildRequires: gnome-keyring-devel
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
@ -51,7 +48,6 @@ BuildRequires: update-desktop-files
|
|||||||
Summary: A virtual Lighttable and Darkroom
|
Summary: A virtual Lighttable and Darkroom
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
Group: Productivity/Graphics/Viewers
|
Group: Productivity/Graphics/Viewers
|
||||||
%gconf_schemas_requires
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
darktable is a virtual lighttable and darkroom for photographers: it manages
|
darktable is a virtual lighttable and darkroom for photographers: it manages
|
||||||
@ -61,7 +57,6 @@ lighttable. it also enables you to develop raw images and enhance them.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
[ ! -d "build" ] && mkdir build
|
[ ! -d "build" ] && mkdir build
|
||||||
@ -72,7 +67,6 @@ export CFLAGS="$CXXFLAGS"
|
|||||||
|
|
||||||
cmake \
|
cmake \
|
||||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL=%{_lib} \
|
-DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL=%{_lib} \
|
||||||
-DDONT_INSTALL_GCONF_SCHEMAS:BOOLEAN=ON \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DBINARY_PACKAGE_BUILD=1 \
|
-DBINARY_PACKAGE_BUILD=1 \
|
||||||
-DINSTALL_IOP_EXPERIMENTAL=Off -DINSTALL_IOP_LEGACY=Off ..
|
-DINSTALL_IOP_EXPERIMENTAL=Off -DINSTALL_IOP_LEGACY=Off ..
|
||||||
@ -82,31 +76,20 @@ cmake \
|
|||||||
cd build
|
cd build
|
||||||
%make_install
|
%make_install
|
||||||
cd ..
|
cd ..
|
||||||
%__mkdir_p %{buildroot}%{_sysconfdir}/gconf/schemas
|
|
||||||
install -m644 data/darktable.schemas %{buildroot}%{_sysconfdir}/gconf/schemas
|
|
||||||
%suse_update_desktop_file darktable
|
%suse_update_desktop_file darktable
|
||||||
find %{buildroot}%{_libdir} -name "*.la" -delete
|
find %{buildroot}%{_libdir} -name "*.la" -delete
|
||||||
%find_lang darktable
|
%find_lang darktable
|
||||||
%find_gconf_schemas
|
|
||||||
cat darktable.schemas_list >> darktable.lang
|
|
||||||
|
|
||||||
%__mkdir_p %{buildroot}%{_defaultdocdir}
|
%__mkdir_p %{buildroot}%{_defaultdocdir}
|
||||||
%__mv %{buildroot}%{_datadir}/doc/darktable %{buildroot}%{_defaultdocdir}
|
%__mv %{buildroot}%{_datadir}/doc/darktable %{buildroot}%{_defaultdocdir}
|
||||||
|
|
||||||
%fdupes %{buildroot}
|
%fdupes %{buildroot}
|
||||||
|
|
||||||
%pre -f %{name}.schemas_pre
|
|
||||||
|
|
||||||
%preun -f %{name}.schemas_preun
|
|
||||||
|
|
||||||
%posttrans -f %{name}.schemas_posttrans
|
|
||||||
|
|
||||||
%files -f darktable.lang
|
%files -f darktable.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc doc/AUTHORS doc/TODO doc/LICENSE
|
%doc doc/AUTHORS doc/TODO doc/LICENSE
|
||||||
%{_bindir}/darktable
|
%{_bindir}/darktable
|
||||||
%{_bindir}/darktable-cltest
|
%{_bindir}/darktable-cltest
|
||||||
%{_bindir}/darktable-faster
|
|
||||||
%{_libdir}/darktable
|
%{_libdir}/darktable
|
||||||
%{_datadir}/applications/darktable.desktop
|
%{_datadir}/applications/darktable.desktop
|
||||||
%{_datadir}/darktable
|
%{_datadir}/darktable
|
||||||
|
Loading…
Reference in New Issue
Block a user