Accepting request 859173 from graphics

OBS-URL: https://build.opensuse.org/request/show/859173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=67

hugin-2019.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e
-size 10335030

hugin-2020.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
+size 10371301

hugin.appdata.patch

@@ -2,10 +2,10 @@ Index: platforms/linux/appdata/PTBatcherGUI.appdata.xml
 ===================================================================
 --- platforms/linux/appdata/PTBatcherGUI.appdata.xml.orig
 +++ platforms/linux/appdata/PTBatcherGUI.appdata.xml
-@@ -3,7 +3,7 @@
+@@ -13,7 +13,7 @@
- <application>
+  <metadata_license>GFDL</metadata_license>
-  <id type="desktop">PTBatcherGUI.desktop</id>
+  <project_license>GPL-2.0-or-later</project_license>
-  <licence>GFDL</licence>
+  <content_rating type="oars-1.1" />
 - <name>Hugin batch processor</name>
 + <name>Hugin Batch Processor</name>
   <summary>A GUI queue manager for stitching multiple hugin projects</summary>
@@ -15,10 +15,10 @@ Index: platforms/linux/appdata/calibrate_lens_gui.appdata.xml
 ===================================================================
 --- platforms/linux/appdata/calibrate_lens_gui.appdata.xml.orig
 +++ platforms/linux/appdata/calibrate_lens_gui.appdata.xml
-@@ -3,7 +3,7 @@
+@@ -13,7 +13,7 @@
- <application>
+  <metadata_license>GFDL</metadata_license>
-  <id type="desktop">calibrate_lens_gui.desktop</id>
+  <project_license>GPL-2.0-or-later</project_license>
-  <licence>GFDL</licence>
+  <content_rating type="oars-1.1" />
 - <name>Hugin calibrate lens</name>
 + <name>Hugin Calibrate Lens</name>
   <summary>Automatic lens calibration</summary>
@@ -28,10 +28,10 @@ Index: platforms/linux/appdata/hugin.appdata.xml
 ===================================================================
 --- platforms/linux/appdata/hugin.appdata.xml.orig
 +++ platforms/linux/appdata/hugin.appdata.xml
-@@ -3,7 +3,7 @@
+@@ -13,7 +13,7 @@
- <application>
+  <metadata_license>GFDL</metadata_license>
-  <id type="desktop">hugin.desktop</id>
+  <project_license>GPL-2.0-or-later</project_license>
-  <licence>GFDL</licence>
+  <content_rating type="oars-1.1" />
 - <name>hugin</name>
 + <name>Hugin Panorama Creator</name>
   <summary>A panoramic photo stitcher and more</summary>

hugin.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Dec 21 15:43:34 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 2020.0.0:
+  * Fixes fast preview on HiDPI screens under GTK+3 and MacOS.
+  * Make fast preview screen zoomable with mouse wheel.
+  * Make hugin_hdrmerge aware of cropped intermediate images.
+  * Several improvements for command line tools (pto_var,
+    pto_move, pto_gen, autooptimiser).
+  * More checks in GUI for strange user input.
+  * Fixes for several bugs.
+- Rebase hugin.appdata.patch to apply cleanly against updated
+  version.
+- Drop pushd-popd sequence bracketing %cmake_install: no longer
+  needed.
+- Adapt file list for appdata -> metainfo change in appdata
+  location.
+- Adapt mv of mimetype icon for change of file name.
+- Pass USE_GDKBACKEND_X11=ON to cmake to enable a workaround to
+  launch on Wayland using the X11 Gdk backend; does not work on
+  Wayland otherwise (see Known issues in Changes.txt).
+- Fix EOL encodings on Changes.txt.
+
 -------------------------------------------------------------------
 Thu Aug 20 13:03:26 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

hugin.spec

@@ -53,8 +53,8 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  vigra-devel
 BuildRequires:  wxGTK3-devel >= 3
-%define mversion 2019.2
+%define mversion 2020.0
-Version:        2019.2.0
+Version:        2020.0.0
 Release:        0
 Summary:        Toolchain for Stitching of Images and Creating Panoramas
 License:        GPL-2.0-or-later
@@ -83,6 +83,8 @@ detection and extraction of key points.
 
 chmod -x AUTHORS authors.txt Changes.txt README COPYING.txt
 
+sed -i "s/\r$//" Changes.txt
+
 # Rename Czech in Czech Republic to Czech.
 mv src/translations/cs_CZ.po src/translations/cs.po
 #sed -i "s/ca_ES/ca/;s/cs_CZ/cs/" src/hugin/po/LINGUAS
@@ -92,15 +94,13 @@ mv src/translations/cs_CZ.po src/translations/cs.po
 	-DENABLE_LAPACK=%{?with_lapack:ON}%{!?with_lapack:OFF} \
 	-DBUILD_HSI=%{?with_hsi:ON}%{!?with_hsi:OFF} \
 	-DCMAKE_SKIP_RPATH:BOOL=OFF \
-	..
+        -DUSE_GDKBACKEND_X11:BOOL=ON
 
 %cmake_build
 
 %install
-pushd .
 %cmake_install
 
-popd
 %suse_update_desktop_file hugin 2DGraphics
 %suse_update_desktop_file PTBatcherGUI 2DGraphics
 %suse_update_desktop_file calibrate_lens_gui 2DGraphics
@@ -109,7 +109,7 @@ popd
 
 # Use better place for MIME icon.
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-mv -f %{buildroot}%{_datadir}/icons/{gnome/48x48/mimetypes/gnome-mime-,hicolor/48x48/mimetypes/}application-x-ptoptimizer-script.png
+mv -f %{buildroot}%{_datadir}/icons/{gnome,hicolor}/48x48/mimetypes/application-x-ptoptimizer-script.png
 rmdir -p --ignore-fail-on-non-empty %{buildroot}%{_datadir}/icons/gnome/48x48/mimetypes
 
 # Install manually so it can be dedup'ed with the one in the program resources
@@ -126,8 +126,8 @@ install -m644 -D -t %{buildroot}%{_licensedir}/hugin/ COPYING.txt
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/mime/packages/*.xml
-%dir %{_datadir}/appdata
+%dir %{_datadir}/metainfo
-%{_datadir}/appdata/*xml
+%{_datadir}/metainfo/*xml
 %dir %{_libdir}/hugin
 %{_libdir}/hugin/*.so.*
 %doc %{_mandir}/man?/*.*