From 609ed31c49663b1a5946d39fca2c55e2432ecf64 Mon Sep 17 00:00:00 2001 From: "Edward W. Koenig" Date: Mon, 30 Jan 2017 07:39:29 +0700 Subject: [PATCH] multimedia/dvdauthor: Updated for version 0.7.2. Signed-off-by: Willy Sudiarto Raharjo --- ...tuff-from-config.h-so-include-it-the.patch | 165 ------------------ multimedia/dvdauthor/dvdauthor.SlackBuild | 14 +- multimedia/dvdauthor/dvdauthor.info | 6 +- 3 files changed, 7 insertions(+), 178 deletions(-) delete mode 100644 multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch diff --git a/multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch b/multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch deleted file mode 100644 index a06f67fd34..0000000000 --- a/multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sat, 19 Jul 2014 21:06:58 +0300 -Subject: [PATCH 361/361] compat.h needs stuff from config.h so include it - there - -This was brought up by dvdvml.* not including it and thus causing a -build failure on Fedora (22) devel. While at it, uninclude config.h -from files where it was included just for compat.h reasons. ---- - src/compat.h | 2 ++ - src/conffile.c | 1 - - src/dvdauthor.c | 2 -- - src/dvdcompile.c | 2 -- - src/dvdpgc.c | 1 - - src/dvdunauthor.c | 2 -- - src/dvduncompile.c | 1 - - src/dvdvob.c | 2 -- - src/readxml.c | 2 -- - src/spuunmux.c | 1 - - src/subgen-encode.c | 2 -- - 11 files changed, 2 insertions(+), 16 deletions(-) - -diff --git a/src/compat.h b/src/compat.h -index 126dcd7..93de081 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -1,6 +1,8 @@ - // basic headers - #define _GNU_SOURCE /* really just for strndup */ - -+#include "config.h" -+ - #ifdef HAVE_STDBOOL_H - # include - #else -diff --git a/src/conffile.c b/src/conffile.c -index cab661a..36ded07 100644 ---- a/src/conffile.c -+++ b/src/conffile.c -@@ -21,7 +21,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" - #include "compat.h" - #include - #include "conffile.h" -diff --git a/src/dvdauthor.c b/src/dvdauthor.c -index d591d68..4860258 100644 ---- a/src/dvdauthor.c -+++ b/src/dvdauthor.c -@@ -20,8 +20,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" -- - #include "compat.h" - - #include -diff --git a/src/dvdcompile.c b/src/dvdcompile.c -index fd232b6..47f13e5 100644 ---- a/src/dvdcompile.c -+++ b/src/dvdcompile.c -@@ -20,8 +20,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" -- - #include "compat.h" - #include - -diff --git a/src/dvdpgc.c b/src/dvdpgc.c -index e0adc61..cf6eb04 100644 ---- a/src/dvdpgc.c -+++ b/src/dvdpgc.c -@@ -20,7 +20,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" - #include "compat.h" - #include - #include -diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c -index ccd422f..f988cdf 100644 ---- a/src/dvdunauthor.c -+++ b/src/dvdunauthor.c -@@ -23,8 +23,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" -- - #include "compat.h" - - #include -diff --git a/src/dvduncompile.c b/src/dvduncompile.c -index 0c5eaf1..a064011 100644 ---- a/src/dvduncompile.c -+++ b/src/dvduncompile.c -@@ -22,7 +22,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" - #include "compat.h" - - #include -diff --git a/src/dvdvob.c b/src/dvdvob.c -index 2d7e2b8..2146689 100644 ---- a/src/dvdvob.c -+++ b/src/dvdvob.c -@@ -20,8 +20,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" -- - #include "compat.h" - - #include -diff --git a/src/readxml.c b/src/readxml.c -index 61ff0a1..3b83f07 100644 ---- a/src/readxml.c -+++ b/src/readxml.c -@@ -20,8 +20,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" -- - #include "compat.h" - - #include -diff --git a/src/spuunmux.c b/src/spuunmux.c -index 1981e41..94fcb10 100644 ---- a/src/spuunmux.c -+++ b/src/spuunmux.c -@@ -31,7 +31,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" - #include "compat.h" - - #include -diff --git a/src/subgen-encode.c b/src/subgen-encode.c -index 53ed4b2..962e902 100644 ---- a/src/subgen-encode.c -+++ b/src/subgen-encode.c -@@ -21,8 +21,6 @@ - * MA 02110-1301 USA. - */ - --#include "config.h" -- - #include "compat.h" - - #include --- -2.1.3 - diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild index f40e829d33..bf785bab21 100644 --- a/multimedia/dvdauthor/dvdauthor.SlackBuild +++ b/multimedia/dvdauthor/dvdauthor.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2007 Brian Reichert # Copyright 2010,2013 Niels Horn - Rio de Janeiro, Brazil -# Copyright 2015 Edward W. Koenig - Vancouver, Washington USA +# Copyright 2015, 2017 Edward W. Koenig - Vancouver, Washington USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,10 +26,11 @@ # Revision date: 2013/03/28 # 25-JUL-2015: new maintainer +# 29-JAN-2017: version update fixes missing header includes PRGNAM=dvdauthor -VERSION=${VERSION:-0.7.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.7.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -74,13 +75,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -( -cd src -patch -p0 < $CWD/config.patch -) - -patch -p1 < $CWD/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/dvdauthor/dvdauthor.info b/multimedia/dvdauthor/dvdauthor.info index 7a3e4174b3..637ac2e379 100644 --- a/multimedia/dvdauthor/dvdauthor.info +++ b/multimedia/dvdauthor/dvdauthor.info @@ -1,8 +1,8 @@ PRGNAM="dvdauthor" -VERSION="0.7.1" +VERSION="0.7.2" HOMEPAGE="http://dvdauthor.sf.net" -DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.7.1.tar.gz" -MD5SUM="2694a5a3ef460106ea3caf0f7f60ff80" +DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.7.2.tar.gz" +MD5SUM="1173dcb8d40e74fc90c0f3a25dbd642d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""