From 85a2333b6b92c6b7689bf6c4acad9551caaf5953 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Thu, 13 Sep 2012 18:55:44 +0200
Subject: multimedia/qdvdauthor: Updated for version 2.3.0.

Added a patch for gcc-4.7.x.
Also disabled the qt4(!) renderer.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 multimedia/qdvdauthor/gcc47.patch           | 33 +++++++++++++++++++++++++++++
 multimedia/qdvdauthor/qdvdauthor.SlackBuild | 11 +++++++---
 multimedia/qdvdauthor/qdvdauthor.info       |  6 +++---
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 multimedia/qdvdauthor/gcc47.patch

(limited to 'multimedia')

diff --git a/multimedia/qdvdauthor/gcc47.patch b/multimedia/qdvdauthor/gcc47.patch
new file mode 100644
index 0000000000..21d5365a46
--- /dev/null
+++ b/multimedia/qdvdauthor/gcc47.patch
@@ -0,0 +1,33 @@
+diff -Naur qdvdauthor-2.1.0.orig/qdvdauthor/oneclickwizard.h qdvdauthor-2.1.0/qdvdauthor/oneclickwizard.h
+--- qdvdauthor-2.1.0.orig/qdvdauthor/oneclickwizard.h	2010-01-09 15:01:14.000000000 +0100
++++ qdvdauthor-2.1.0/qdvdauthor/oneclickwizard.h	2012-09-13 13:21:08.191001640 +0200
+@@ -12,6 +12,7 @@
+ #ifndef ONECLICKWIZARD_H
+ #define ONECLICKWIZARD_H
+ 
++#include <unistd.h>
+ #include "dialogfiles.h"
+ #include "plugins/interface.h"
+ #include "uioneclickwizard.h"
+diff -Naur qdvdauthor-2.1.0.orig/qdvdauthor/qplayer/engines/xineinfo.h qdvdauthor-2.1.0/qdvdauthor/qplayer/engines/xineinfo.h
+--- qdvdauthor-2.1.0.orig/qdvdauthor/qplayer/engines/xineinfo.h	2010-01-09 15:01:14.000000000 +0100
++++ qdvdauthor-2.1.0/qdvdauthor/qplayer/engines/xineinfo.h	2012-09-13 13:24:14.570985447 +0200
+@@ -12,6 +12,7 @@
+ #ifndef XINEINFO_H
+ #define XINEINFO_H
+ 
++#include <unistd.h>
+ #include <qthread.h>
+ #include <qstring.h>
+ 
+diff -Naur qdvdauthor-2.1.0.orig/qdvdauthor/render_client.h qdvdauthor-2.1.0/qdvdauthor/render_client.h
+--- qdvdauthor-2.1.0.orig/qdvdauthor/render_client.h	2010-01-09 15:01:14.000000000 +0100
++++ qdvdauthor-2.1.0/qdvdauthor/render_client.h	2012-09-13 13:20:28.254016622 +0200
+@@ -12,6 +12,7 @@
+ #ifndef RENDER_CLIENT_H
+ #define RENDER_CLIENT_H
+ 
++#include <unistd.h>
+ #include <qthread.h>
+ #include <qsocket.h>
+ #include <qpixmap.h>
diff --git a/multimedia/qdvdauthor/qdvdauthor.SlackBuild b/multimedia/qdvdauthor/qdvdauthor.SlackBuild
index 4aa24595be..49e6c38c76 100644
--- a/multimedia/qdvdauthor/qdvdauthor.SlackBuild
+++ b/multimedia/qdvdauthor/qdvdauthor.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Giovanne Castro (giovannefc@terra.com.br)
 
 PRGNAM=qdvdauthor
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 tar xvf $CWD/masks.tar.bz2
 tar xvf $CWD/buttons.tar.bz2
@@ -55,12 +55,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix for gcc-4.7.x
+patch -p1 < $CWD/gcc47.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure -n \
   --prefix=$PKG/usr \
   --system-path=/usr \
-  --omit-local-ffmpeg
+  --omit-local-ffmpeg \
+  --build-qslideshow \
+  --omit-qrender
 
 ./configure -n --install
 
diff --git a/multimedia/qdvdauthor/qdvdauthor.info b/multimedia/qdvdauthor/qdvdauthor.info
index 16f8478bb2..3cc950462b 100644
--- a/multimedia/qdvdauthor/qdvdauthor.info
+++ b/multimedia/qdvdauthor/qdvdauthor.info
@@ -1,11 +1,11 @@
 PRGNAM="qdvdauthor"
-VERSION="2.1.0"
+VERSION="2.3.0"
 HOMEPAGE="http://qdvdauthor.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/qdvdauthor/qdvdauthor-2.1.0.tar.gz \
+DOWNLOAD="http://downloads.sourceforge.net/qdvdauthor/qdvdauthor-2.3.0.tar.gz \
 	  http://qdvdauthor.sourceforge.net/data/masks.tar.bz2 \
 	  http://qdvdauthor.sourceforge.net/data/buttons.tar.bz2 \
 	  http://qdvdauthor.sourceforge.net/data/alpha_trans.tar.bz2"
-MD5SUM="c4b1e5977d51fcb0ed4bd06984f5bffa \
+MD5SUM="5b5d374d4d794f18b4bac386f807f0be \
 	1ed15c30ffaf344c97fdadfca390fc78 \
 	d6e546a256bddbcfaa068505b572b45c \
 	0c6679e836f452c3b8bc14256fd7f460"
-- 
cgit v1.2.3