From 8f3b41d5fe25dba02841042be7c2d956dac99b36 Mon Sep 17 00:00:00 2001
From: 4fury-c3440d8 <icu7c1@gmail.com>
Date: Sun, 27 Sep 2020 15:00:55 +0300
Subject: [PATCH] devedeNG, dvdauthor: ver. bump

---
 multimedia/converter/vcdimager/pspec.xml      |   4 +-
 multimedia/editor/devedeNG/actions.py         |   6 +-
 multimedia/editor/devedeNG/pspec.xml          |  17 ++-
 multimedia/editor/dvdauthor/actions.py        |  10 +-
 .../dvdauthor/files/backport_from_git.patch   | 115 ++++++++++++++++++
 multimedia/editor/dvdauthor/pspec.xml         |  21 ++--
 6 files changed, 152 insertions(+), 21 deletions(-)
 create mode 100644 multimedia/editor/dvdauthor/files/backport_from_git.patch

diff --git a/multimedia/converter/vcdimager/pspec.xml b/multimedia/converter/vcdimager/pspec.xml
index ea97c44f36..945d2a0034 100644
--- a/multimedia/converter/vcdimager/pspec.xml
+++ b/multimedia/converter/vcdimager/pspec.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>vcdimager</Name>
-        <Homepage>http://www.vcdimager.org/</Homepage>
+        <Homepage>https://www.gnu.org/software/vcdimager/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
diff --git a/multimedia/editor/devedeNG/actions.py b/multimedia/editor/devedeNG/actions.py
index 65a011b3e5..db6a22b442 100644
--- a/multimedia/editor/devedeNG/actions.py
+++ b/multimedia/editor/devedeNG/actions.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
 from pisi.actionsapi import pythonmodules
 from pisi.actionsapi import get
@@ -12,9 +12,9 @@ def setup():
     pythonmodules.compile(pyVer = "3")
 
 def build():
-    pythonmodules.compile(pyVer="3")
+    pythonmodules.compile(pyVer = "3")
 
-def install(): 
+def install():
     pythonmodules.install(pyVer = "3")
 
     pisitools.dodoc("COPYING", "README.md")
diff --git a/multimedia/editor/devedeNG/pspec.xml b/multimedia/editor/devedeNG/pspec.xml
index 407a6d5e1b..4edf5f0cbc 100644
--- a/multimedia/editor/devedeNG/pspec.xml
+++ b/multimedia/editor/devedeNG/pspec.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>devedeNG</Name>
-        <Homepage>http://www.rastersoft.com/programas/devede.html</Homepage>
+        <Homepage>https://rastersoft.com/programas/devede.html</Homepage>
         <Packager>
             <Name>Kamil Atlı</Name>
             <Email>suvari@pisilinux.org</Email>
@@ -16,7 +16,7 @@
         <Description>Devede NG is a rewrite of the Devede DVD disc authoring program. This new
 code has been written from scratch, and uses Python3 and Gtk3. It is also
 cleaner, which will allow to add new features in the future.</Description>
-        <Archive sha1sum="9a02b56ce8da3e0c0399c7e951841e9113dbd7fe" type="targz">https://sourceforge.net/projects/pisilinux/files/source/devedeng-4.12.0.tar.gz</Archive>
+        <Archive sha1sum="2457f27a2ee500cf925ce1fec3101d3f25026709" type="tarbz2">https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>gtk3-devel</Dependency>
             <Dependency>ffmpeg-devel</Dependency>
@@ -24,7 +24,7 @@ cleaner, which will allow to add new features in the future.</Description>
             <Dependency>python3-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">desktop.patch</Patch> -->
+            <!-- <Patch level="1">desktop.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -51,7 +51,7 @@ cleaner, which will allow to add new features in the future.</Description>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man/man1</Path>
         </Files>
-<!--         <AdditionalFiles>
+        <!-- <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/16x16/apps/devede.png">devede-16.png</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/32x32/apps/devede.png">devede-32.png</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/48x48/apps/devede.png">devede-48.png</AdditionalFile>
@@ -59,6 +59,13 @@ cleaner, which will allow to add new features in the future.</Description>
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2020-09-27</Date>
+            <Version>4.16.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>wascheme@tuta.io</Email>
+        </Update>
         <Update release="2">
             <Date>2020-03-05</Date>
             <Version>4.12.0</Version>
diff --git a/multimedia/editor/dvdauthor/actions.py b/multimedia/editor/dvdauthor/actions.py
index 8427ab75c9..8d993972a6 100644
--- a/multimedia/editor/dvdauthor/actions.py
+++ b/multimedia/editor/dvdauthor/actions.py
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools
+#from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
@@ -13,8 +13,10 @@ WorkDir = "dvdauthor"
 
 def setup():
     # disable ImageMagick, use GraphicsMagick
-    shelltools.export("MAGICKCONFIG", "/bin/true")
+    #shelltools.export("MAGICKCONFIG", "/bin/true")
+    autotools.autoreconf("-fiv")
     autotools.configure("--disable-rpath \
+                         --with-graphicsmagick \
                          --enable-default-video-format=NTSC")
 
 def build():
@@ -23,4 +25,4 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("TODO", "README", "ChangeLog", "NEWS")
+    pisitools.dodoc("AUTHORS", "ChangeLog", "README")
diff --git a/multimedia/editor/dvdauthor/files/backport_from_git.patch b/multimedia/editor/dvdauthor/files/backport_from_git.patch
new file mode 100644
index 0000000000..0d23ea0fdf
--- /dev/null
+++ b/multimedia/editor/dvdauthor/files/backport_from_git.patch
@@ -0,0 +1,115 @@
+diff --git a/ChangeLog b/ChangeLog
+index 596e22d..1cf42b1 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++0.7.2+: 2017 July 4
++    No longer automatically build with ImageMagick or GraphicsMagick if
++	    present; now need to explicitly specify --with-imagemagick or
++		--with-graphicsmagick to configure
++
+ 0.7.2: 2016 December 31
+ 	Various code-quality and build improvements
+ 	Support “jump pgc n” and other interaction code-generation improvements
+diff --git a/configure.ac b/configure.ac
+index f4b270f..1194059 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT(DVDAuthor,0.7.2,dvdauthor-users@lists.sourceforge.net)
++AC_INIT(DVDAuthor,0.7.2+,dvdauthor-users@lists.sourceforge.net)
+ 
+ AC_CONFIG_HEADERS(src/config.h)
+ AC_CONFIG_AUX_DIR(autotools)
+@@ -45,35 +45,30 @@ if test "$enable_shared" = 'no'; then
+     config_static='--static'
+ fi
+ 
+-usemagick=0
+-
+-AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
+-if test -n "$MAGICKCONFIG"; then
+-    ac_save_CPPFLAGS="$CPPFLAGS"
+-    ac_save_LIBS="$LIBS"
+-    MAGICK_CPPFLAGS="`$MAGICKCONFIG --cppflags`"
+-    MAGICK_LIBS="`$MAGICKCONFIG --ldflags` `$MAGICKCONFIG --libs`"
+-    CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
+-    LIBS="$MAGICK_LIBS $LIBS"
+-    AC_CHECK_FUNC(ExportImagePixels, usemagick=1, AC_MSG_NOTICE([ImageMagick does not support the function
+-         ExportImagePixels.  Please upgrade to ImageMagick 5.5.7 or newer]))
+-    CPPFLAGS="$ac_save_CPPFLAGS"
+-    LIBS="$ac_save_LIBS"
+-    if test "$usemagick" = 1; then
+-        AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available])
+-    fi
++use_imagemagick=0
++use_graphicsmagick=0
++AC_ARG_WITH([imagemagick], AS_HELP_STRING([--with-imagemagick], [Use ImageMagick to augment image import formats]), [if test "$withval" != "no"; then use_imagemagick=1; fi])
++AC_ARG_WITH([graphicsmagick], AS_HELP_STRING([--with-graphicsmagick], [Use GraphicsMagick to augment image import formats]), [if test "$withval" != "no"; then use_graphicsmagick=1; fi])
++if test "$use_imagemagick" = 1 && test "$use_graphicsmagick" = 1; then
++    AC_MSG_ERROR([cannot specify both --with-imagemagick and --with-graphicsmagick], 1)
+ fi
+ 
+-if test "$usemagick" != 1; then
+-    PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:])
++if test "$use_imagemagick" = 1; then
++    PKG_CHECK_MODULES([IMAGEMAGICK], [ImageMagick >= 5.5.7], [AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available])], [AC_MSG_ERROR([ImageMagick not available])])
++    MAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS"
++    MAGICK_LIBS="$IMAGEMAGICK_LIBS"
+ fi
+-
+-if test "$usemagick" != 1; then
+-    MAGICK_CPPFLAGS="$LIBPNG_CFLAGS"
++if test "$use_graphicsmagick" = 1; then
++    PKG_CHECK_MODULES([GRAPHICSMAGICK], [GraphicsMagick], [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [AC_MSG_ERROR([GraphicsMagick not available])])
++    MAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS"
++    MAGICK_LIBS="$GRAPHICSMAGICK_LIBS"
++fi
++if test "$use_imagemagick" != 1 && test "$use_graphicsmagick" != 1; then
++    MAGICK_CFLAGS="$LIBPNG_CFLAGS"
+     MAGICK_LIBS="$LIBPNG_LIBS"
+ fi
+ 
+-AC_SUBST(MAGICK_CPPFLAGS)
++AC_SUBST(MAGICK_CFLAGS)
+ AC_SUBST(MAGICK_LIBS)
+ 
+ PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [AC_DEFINE(HAVE_FONTCONFIG, 1, [whether Fontconfig is available])], [:])
+@@ -84,10 +79,8 @@ PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1, [whether Fri
+ AC_SUBST(FRIBIDI_CFLAGS)
+ AC_SUBST(FRIBIDI_LIBS)
+ 
+-AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
+-if test -n "$FREETYPECONFIG"; then
+-    FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`"
+-    FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`"
++PKG_CHECK_MODULES(FREETYPE, [freetype2],[
++    FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS"
+     AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available])
+ 
+     ac_save_CPPFLAGS="$CPPFLAGS"
+@@ -96,9 +89,9 @@ if test -n "$FREETYPECONFIG"; then
+     CPPFLAGS="$ac_save_CPPFLAGS"
+     AC_SUBST(FREETYPE_CPPFLAGS)
+     AC_SUBST(FREETYPE_LIBS)
+-else
++    ],
+     AC_MSG_ERROR([freetype not found])
+-fi
++)
+ 
+ 
+ AC_ARG_ENABLE([default-video-format],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c7f89a9..5ef90c3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@ endif
+ nodist_bin_SCRIPTS = dvddirdel
+ 
+ AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \
+-    @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
++    @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
+ AM_CFLAGS = -Wall
+ 
+ dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \
diff --git a/multimedia/editor/dvdauthor/pspec.xml b/multimedia/editor/dvdauthor/pspec.xml
index 8d2f652ce5..63a93efd74 100644
--- a/multimedia/editor/dvdauthor/pspec.xml
+++ b/multimedia/editor/dvdauthor/pspec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>dvdauthor</Name>
@@ -12,19 +12,19 @@
         <IsA>app:console</IsA>
         <Summary>A simple DVD tool</Summary>
         <Description>dvdauthor is a set of simple tools to help you author a DVD.</Description>
-        <Archive sha1sum="a9636d165bf546e3e2b25b7397c33dbfa2895e6a" type="targz">https://sourceforge.net/projects/dvdauthor/files/dvdauthor/0.7.1/dvdauthor-0.7.1.tar.gz</Archive>
+        <Archive sha1sum="0e605642140576bfb3e963414d77630d1c073a51" type="targz">https://sourceforge.net/projects/dvdauthor/files/dvdauthor-0.7.2.tar.gz</Archive>
         <BuildDependencies>
+            <Dependency>libpng-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
             <Dependency>fribidi-devel</Dependency>
+            <Dependency>freetype-devel</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
             <Dependency>libdvdread-devel</Dependency>
             <Dependency>imagemagick-devel</Dependency>
             <Dependency>GraphicsMagick-devel</Dependency>
-            <Dependency>fontconfig-devel</Dependency>
-            <Dependency>freetype-devel</Dependency>
-            <Dependency>libpng-devel</Dependency>
-            <Dependency>libxml2-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">dvdauthor-fix-build.patch</Patch>
+            <Patch level="1">backport_from_git.patch</Patch>
         </Patches>
     </Source>
 
@@ -49,6 +49,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2020-09-27</Date>
+            <Version>0.7.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>wascheme@tuta.io</Email>
+        </Update>
         <Update release="4">
             <Date>2020-03-05</Date>
             <Version>0.7.1</Version>