diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2527cb7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +/darktable-1.1.3.tar.gz +/darktable-1.1.4.tar.xz +/darktable-1.2~rc1.tar.xz +/darktable-1.2~rc2.tar.xz +/darktable-1.2.tar.xz +/darktable-1.2.1.tar.xz +/darktable-generate-nopatents-tarball.sh +/darktable-1.2.1-nopatents.tar.xz +/darktable-1.2.2.tar.xz +/darktable-1.2.2-nopatents.tar.xz +/darktable-1.2.3-nopatents.tar.xz +/try_to_make_dt_compile_with_colord_support_on_fedora.patch +/darktable-1.4~rc1-nopatents.tar.xz +/darktable-1.4-nopatents.tar.xz +/darktable-1.4.1-nopatents.tar.xz +/darktable-1.4.2-nopatents.tar.xz +/darktable-1.5.1-nopatents.tar.xz +/darktable-1.6.0-nopatents.tar.xz +/darktable-1.6.1-nopatents.tar.xz +/darktable-1.6.2-nopatents.tar.xz +/darktable-1.6.3-nopatents.tar.xz +/darktable-1.6.4-nopatents.tar.xz +/darktable-1.6.6-nopatents.tar.xz +/darktable-1.6.7-nopatents.tar.xz +/darktable-1.6.8-nopatents.tar.xz diff --git a/darktable-patch.patch b/darktable-patch.patch new file mode 100644 index 0000000..2590436 --- /dev/null +++ b/darktable-patch.patch @@ -0,0 +1,36 @@ +From 826152bc3564e74133680cc53e69e040d3663b47 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= +Date: Mon, 2 Mar 2015 13:30:53 +0000 +Subject: [PATCH] Support for the Canon "Digital Rebel" (300D alias) + +--- + src/external/adobe_coeff.c | 1 + + src/external/rawspeed/data/cameras.xml | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/src/external/adobe_coeff.c b/src/external/adobe_coeff.c +index 051c896..5b4be66 100644 +--- a/src/external/adobe_coeff.c ++++ b/src/external/adobe_coeff.c +@@ -36,6 +36,7 @@ static void dt_dcraw_adobe_coeff(const char *name, float cam_xyz[1][12]) + { "Canon EOS 60D", 0, 0x2ff7, { 6719,-994,-925,-4408,12426,2211,-887,2129,6051 } }, + { "Canon EOS 70D", 0, 0x3bc7, { 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 } }, + { "Canon EOS 100D", 0, 0x350f, { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, ++ { "Canon EOS DIGITAL REBEL", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, + { "Canon EOS 300D DIGITAL", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, + { "Canon EOS 350D DIGITAL", 0, 0xfff, { 6018,-617,-965,-8645,15881,2975,-1530,1719,7642 } }, + { "Canon EOS 400D DIGITAL", 0, 0xe8e, { 7054,-1501,-990,-8156,15544,2812,-1278,1414,7796 } }, +diff --git a/src/external/rawspeed/data/cameras.xml b/src/external/rawspeed/data/cameras.xml +index 50b798d..b19507e 100644 +--- a/src/external/rawspeed/data/cameras.xml ++++ b/src/external/rawspeed/data/cameras.xml +@@ -101,6 +101,9 @@ + + + ++ ++ Canon EOS DIGITAL REBEL ++ + + + diff --git a/darktable.spec b/darktable.spec new file mode 100644 index 0000000..c872e1c --- /dev/null +++ b/darktable.spec @@ -0,0 +1,463 @@ +#without --enable_gegl "until gegl is fast enough" as developers tell +%define with_gegl 0 + +Name: darktable +Version: 1.6.8 +Release: 2%{?dist} +Summary: Utility to organize and develop raw images + +Group: Applications/Multimedia +License: GPLv3+ +URL: http://www.darktable.org/ +Source0: %{name}-%{version}-nopatents.tar.xz + +# darktable contains patented code (DXT/S3TC/Squish) that we cannot ship. +# Therefore we use this script to remove the patented code before +# shipping it. +# Download the upstream tarball and invoke this script while in the +# tarball's directory: +# ./dartabke-generate-nopatents-tarball.sh +Source1: darktable-generate-nopatents-tarball.sh + +BuildRequires: cmake +BuildRequires: pkgconfig >= 0.22 +BuildRequires: intltool, gettext +BuildRequires: cairo-devel +BuildRequires: sqlite-devel +BuildRequires: GraphicsMagick-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel +BuildRequires: openjpeg-devel, libwebp-devel +BuildRequires: librsvg2-devel >= 2.26 +BuildRequires: lcms2-devel +BuildRequires: exiv2-devel +BuildRequires: lensfun-devel +BuildRequires: OpenEXR-devel >= 1.6 +BuildRequires: libgphoto2-devel >= 2.4.5 +BuildRequires: libcurl-devel >= 7.18.0 +BuildRequires: flickcurl-devel +BuildRequires: desktop-file-utils +BuildRequires: SDL-devel +BuildRequires: libsecret-devel +BuildRequires: libsoup-devel +BuildRequires: json-glib-devel +BuildRequires: lua-devel +%if 0%{?with_gegl} +BuildRequires: gegl-devel +%endif +BuildRequires: colord-devel +BuildRequires: /usr/bin/pod2man +BuildRequires: opencl-headers + +Requires: gtk2-engines + +# uses xmmintrin.h +ExclusiveArch: %{ix86} x86_64 + + +%description +Darktable is a virtual light-table and darkroom for photographers: +it manages your digital negatives in a database and lets you view them +through a zoom-able light-table. +It also enables you to develop raw images and enhance them. + + +%prep +%setup -q + +# This is a little hacky, but it ensures we're building against the opencl system headers +rm -rf src/external/CL/*.h* +cp -a /usr/include/CL/*.h* src/external/CL/ +# Remove bundled lua +rm -rf src/external/lua/ + +%build +mkdir %{_target_platform} +pushd %{_target_platform} +%cmake \ + -DCMAKE_LIBRARY_PATH:PATH=%{_libdir} \ + -DUSE_GEO:BOOLEAN=ON \ + -DUSE_SQUISH:BOOLEAN=OFF \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DBINARY_PACKAGE_BUILD=1 \ + -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \ + .. + + +make %{?_smp_mflags} VERBOSE=1 +popd +pushd tools/noise +make %{?_smp_mflags} + + +%install +pushd %{_target_platform} +make install DESTDIR=%{buildroot} +popd +find %{buildroot} -name '*.la' -exec rm -f {} ';' +%find_lang %{name} +rm -rf %{buildroot}%{_datadir}/doc/darktable +mkdir -p %{buildroot}%{_datadir}/darktable/tools/noise +rm tools/noise/*.c +rm tools/noise/Makefile +cp tools/noise/* %{buildroot}%{_datadir}/darktable/tools/noise/ + + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + +%files -f %{name}.lang +%license doc/LICENSE +%doc doc/README doc/AUTHORS doc/TRANSLATORS +%{_bindir}/darktable +%{_bindir}/darktable-cli +%{_bindir}/darktable-cltest +%{_bindir}/darktable-cmstest +%{_bindir}/darktable-viewer +%{_libdir}/darktable +%{_datadir}/applications/darktable.desktop +%{_datadir}/appdata/darktable.appdata.xml +%{_datadir}/darktable +%{_datadir}/icons/hicolor/*/apps/darktable* +%{_datadir}/man/man1/darktable.1.gz +%{_datadir}/man/man1/darktable-cli.1.gz + +%changelog +* Tue Sep 08 2015 Kalev Lember - 1.6.8-2 +- Build with system lua +- Remove bundled lua in prep to make sure it's not used + +* Tue Sep 08 2015 Kalev Lember - 1.6.8-1 +- Update to 1.6.8 +- Modernize spec file for current rpmbuild +- Drop GConf handling now that darktable no longer uses it +- Drop unused build deps +- Build with libsecret support, instead of libgnome-keyring +- Use license macro + +* Tue Jul 7 2015 Tom Callaway - 1.6.7-4 +- unbundle opencl headers (and use system opencl headers) + +* Wed Jun 24 2015 Rex Dieter - 1.6.7-3 +- rebuild (exiv2) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 9 2015 Germano Massullo - 1.6.7-1 +- Corrected Darktable website in spec file +- Minor update + +* Thu May 14 2015 Nils Philippsen - 1.6.6-2 +- rebuild for lensfun-0.3.1 + +* Sun Apr 26 2015 Germano Massullo - 1.6.6-1 +- Minor update. Full changelog at https://github.com/darktable-org/darktable/releases/tag/release-1.6.6 + +* Sat Apr 4 2015 Germano Massullo - 1.6.4-1 +- Minor update. Full changelog at https://github.com/darktable-org/darktable/releases/tag/release-1.6.4 +- Removed patch for Canon EOS Rebel, because the fixed code is in the upstream stable release. + +* Wed Mar 18 2015 Germano Massullo - 1.6.3-2 +- Backport of fix for bugreport #1202105 + +* Mon Mar 02 2015 Germano Massullo - 1.6.3-1 +- Darktable 1.6.3 +- Fixed date of Feb 22 2015 changelog. + +* Sun Feb 22 2015 Germano Massullo - 1.6.2-5 +- Removed LUA support due missing LUA 5.3 support by Darktable. This will avoid breaking build tree. + +* Wed Feb 04 2015 Germano Massullo - 1.6.2-4 +- Removed "Requires: lua-devel" + +* Wed Feb 04 2015 Germano Massullo - 1.6.2-3 +- Added LUA support + +* Wed Feb 04 2015 Edouard Bourguignon - 1.6.2-2 +- Aesthetic changes (useless spaces) +- Use mkdir %{_target_platform} instead of buildFedora +- Consistence use of %var instead of $VAR + +* Mon Feb 02 2015 Edouard Bourguignon - 1.6.2-1 +- Darktable 1.6.2 + +* Sun Feb 01 2015 Edouard Bourguignon - 1.6.1-1 +- Darktable 1.6.1 + +* Wed Jan 21 2015 Peter Robinson 1.6.0-2 +- Rebuild (libgpohoto2) + +* Tue Dec 09 2014 Edouard Bourguignon - 1.6.0-1 +- Darktable 1.6.0 stable + +* Sat Dec 06 2014 Edouard Bourguignon - 1.5.1-0.2 +- Add missing darktable-cmstest + +* Sat Dec 06 2014 Edouard Bourguignon - 1.5.1-0.1 +- Darktable 1.6 rc1 + +* Wed Nov 26 2014 Rex Dieter 1.4.2-4 +- rebuild (openexr) + +* Sat Aug 16 2014 Fedora Release Engineering - 1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Apr 25 2014 Edouard Bourguignon - 1.4.2-1 +- Upgrade to 1.4.2 + +* Mon Mar 3 2014 Edouard Bourguignon - 1.4.1-3 +- Remove wrong library path + +* Mon Mar 3 2014 Edouard Bourguignon - 1.4.1-2 +- Restore rpath for internal lib + +* Wed Feb 12 2014 Edouard Bourguignon - 1.4.1-1 +- Upgrade to 1.4.1 +- Remove tools source files + +* Tue Jan 14 2014 Edouard Bourguignon - 1.4-2 +- Add OpenJPEG and WebP support +- Add missing buildrequires on pod2man + +* Wed Jan 1 2014 Edouard Bourguignon - 1.4-1 +- Upgrade to 1.4 + +* Mon Dec 2 2013 Edouard Bourguignon - 1.4-0.1.rc1 +- Upgrade to 1.4~rc1 + +* Sun Nov 24 2013 Edouard Bourguignon - 1.2.3-2 +- Add colord-devel support + +* Sun Sep 15 2013 Edouard Bourguignon - 1.2.3-1 +- Upgrade to 1.2.3 + +* Tue Jun 25 2013 Edouard Bourguignon - 1.2.2-1 +- Upgrade to 1.2.2 + +* Tue Jun 11 2013 Edouard Bourguignon - 1.2.1-4 +- Remove patented code (DXT/squish) + +* Mon Jun 10 2013 Edouard Bourguignon - 1.2.1-3 +- Patch to make squish optional + +* Mon Jun 10 2013 Edouard Bourguignon - 1.2.1-2 +- fix for CVE-2013-2126 (Thanks to Alex Tutubalin's patch) +- Do not use squish (bug #972604) + +* Sun May 26 2013 Edouard Bourguignon - 1.2.1-1 +- Upgrade to 1.2.1 + +* Thu May 2 2013 Edouard Bourguignon - 1.2-2 +- Add profiling sensor and photon noise tools + +* Sat Apr 6 2013 Edouard Bourguignon - 1.2-1 +- Upgrade to 1.2 + +* Sun Mar 10 2013 Edouard Bourguignon - 1.1.4-2 +- Rebuild + +* Sun Mar 10 2013 Edouard Bourguignon - 1.1.4-1 +- Upgrade to 1.1.4 + +* Fri Feb 22 2013 Edouard Bourguignon - 1.1.3-2 +- Add some missing dependancies + +* Mon Feb 11 2013 Edouard Bourguignon - 1.1.3-1 +- Upgrade to 1.1.3 + +* Fri Feb 1 2013 Edouard Bourguignon - 1.1.2+26~ge1f2980 +- Pre 1.1.3 + +* Mon Jan 21 2013 Edouard Bourguignon - 1.1.2-2 +- Add missing gtk2-engine dependancy (bug #902288) + +* Sat Jan 12 2013 Edouard Bourguignon - 1.1.2-1 +- Upgrade to 1.1.2 + +* Sun Jan 6 2013 Edouard Bourguignon - 1.1.1-2 +- Add map mode + +* Wed Nov 28 2012 Edouard Bourguignon - 1.1.1-1 +- Upgrade to 1.1.1 + +* Sat Nov 24 2012 Edouard Bourguignon - 1.1-1 +- Upgrade to 1.1 + +* Wed Nov 14 2012 Edouard Bourguignon - 1.1-0.1.rc2 +- Upgrade to 1.1~rc2 + +* Wed Oct 31 2012 Edouard Bourguignon - 1.1-0.1.rc1 +- Upgrade to 1.1~rc1 + +* Thu Jul 26 2012 Edouard Bourguignon - 1.0.5-1 +- Upgrade to 1.0.5 + +* Wed Jul 18 2012 Fedora Release Engineering - 1.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jul 15 2012 Jindrich Novy - 1.0.4-2 +- rebuild because of new libgphoto2 + +* Sat Jun 30 2012 Edouard Bourguignon - 1.0.4-1 +- Upgrade to 1.0.4 + +* Sun Apr 29 2012 Edouard Bourguignon - 1.0.3-1 +- Upgrade to 1.0.3 + +* Sat Apr 28 2012 Edouard Bourguignon - 1.0.1-1 +- Upgrade to 1.0.1 + +* Thu Mar 15 2012 Edouard Bourguignon - 1.0-1 +- Upgrade to stable 1.0 + +* Sun Mar 11 2012 Edouard Bourguignon - 1.0-0.4.rc2 +- Remove pre script + +* Sat Mar 10 2012 Edouard Bourguignon - 1.0-0.3.rc2 +- Patch for uninitialised variables + +* Sat Mar 10 2012 Edouard Bourguignon - 1.0-0.2.rc2 +- Remove useless darktable gconf schemas + +* Sat Mar 10 2012 Edouard Bourguignon - 1.0-0.1.rc2 +- Upgrade to rc2 + +* Wed Mar 7 2012 Edouard Bourguignon - 1.0-0.2.rc1 +- Correct invalid type in darktable gconf schemas + +* Sun Mar 4 2012 Edouard Bourguignon - 1.0-0.1.rc1 +- Darktable 1.0 RC1 + +* Mon Dec 5 2011 Edouard Bourguignon - 0.9.3-2 +- Add SDL-devel for darktable-viewer + +* Mon Nov 7 2011 Edouard Bourguignon - 0.9.3-1 +- Upgrade to 0.9.3 + +* Fri Oct 14 2011 Rex Dieter - 0.9.2-2 +- rebuild (exiv2) + +* Fri Aug 26 2011 Edouard Bourguignon - 0.9.2-1 +- Upgrade to 0.9.2 + +* Thu Jul 28 2011 Edouard Bourguignon - 0.9.1-1 +- Upgrade to 0.9.1 +- Remove some old patches + +* Sat Jul 2 2011 Edouard Bourguignon - 0.9-1 +- Upgrade to 0.9 + +* Mon May 23 2011 Edouard Bourguignon - 0.8-11 +- Add a patch for BINARY_PACKAGE_BUILD (preventing march=native) + +* Fri Apr 22 2011 Dan Horák - 0.8-10 +- make it x86-only + +* Fri Apr 22 2011 Dan Horák - 0.8-9 +- don't use x86-only compiler flags on non-x86 arches + +* Tue Apr 19 2011 Edouard Bourguignon - 0.8-8 +- Change build option + +* Mon Apr 11 2011 Rex Dieter - 0.8-7.1 +- rebuild (exiv2) + +* Wed Mar 30 2011 Edouard Bourguignon - 0.8-7 +- Change cmake options + +* Tue Mar 22 2011 Edouard Bourguignon - 0.8-6 +- Keep rpath for internal libs + +* Wed Feb 23 2011 Edouard Bourguignon - 0.8-5 +- Change build options +- Change permission on gconf darktable.schemas +- Add patch and cmake option to remove relative path (thanks to Karl Mikaelsson) + +* Sat Feb 19 2011 Edouard Bourguignon - 0.8-4 +- Add missing doc files + +* Sat Feb 19 2011 Edouard Bourguignon - 0.8-3 +- Clean up set but unused variables patch for GCC 4.6 (Karl Mikaelsson) + +* Thu Feb 17 2011 Edouard Bourguignon - 0.8-2 +- Add flickcurl support +- Add patch to fix unused but set variables + +* Tue Feb 15 2011 Edouard Bourguignon - 0.8-1 +- Upgrade to version 0.8 +- Rebuilt using cmake + +* Tue Feb 08 2011 Fedora Release Engineering - 0.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Edouard Bourguignon - 0.7.1-3 +- Change exiv2 headers to use the new umbrella header (#666887) + +* Sat Jan 01 2011 Rex Dieter - 0.7.1-2 +- rebuild (exiv2) + +* Tue Dec 14 2010 Edouard Bourguignon - 0.7.1-1 +- Upgrade to version 0.7.1 + +* Mon Nov 29 2010 Edouard Bourguignon - 0.7-1 +- Upgrade to darktable 0.7 + +* Mon Sep 20 2010 Edouard Bourguignon - 0.6-9 +- Only use RPM_BUILD_ROOT +- Remove duplicated doc + +* Mon Sep 20 2010 Edouard Bourguignon - 0.6-8 +- Change gegl-devel buildrequires +- Correct with_gegl option +- Correct typo in changelog +- Remove useless configure option (--disable-schemas) +- Add buildrequires on pkgconfig + +* Fri Sep 10 2010 Edouard Bourguignon - 0.6-7 +- Remove useless removal of *.a files +- Change name of desktop patch (no version) + +* Tue Aug 31 2010 Dmitrij S. Kryzhevich - 0.6-6 +- disable static lib and schemas +- update desktop database and icon cache +- disable gegl support + +* Mon Aug 30 2010 Edouard Bourguignon - 0.6-5 +- Upgrade to Darktable 0.6 +- Change to tar.gz for source0 +- Remove rpath patch +- Add BuildRequires on missing devel packages +- Change path to libdarktable.so +- Add icons +- Make a clean desktop file +- Add desktop file validation + +* Mon Aug 23 2010 Edouard Bourguignon - 0.5-4 +- Use Gconf scriplets to hangle gconf schema +- Add a patch to remove rpath from Dmitrij S. Kryzhevich + +* Wed Jul 7 2010 Edouard Bourguignon - 0.5-3 +- Removing rpath + +* Fri Apr 23 2010 Edouard Bourguignon - 0.5-2 +- Update to 0.5 +- Shorten file list +- Use devel packages for building +- Correct URL for Source0 + +* Tue Feb 02 2010 İbrahim Eser - 0.4-1 +- Initial package. diff --git a/dead.package b/dead.package deleted file mode 100644 index 60c559b..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -https://fedorahosted.org/fesco/ticket/1475 diff --git a/sources b/sources new file mode 100644 index 0000000..ce56dd6 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +39442d068e4e345fafb281a394b2b227 darktable-1.6.8-nopatents.tar.xz +fd37e12393ccd8e1cfa955b99dc13715 darktable-generate-nopatents-tarball.sh