summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/dvdstyler/README2
-rw-r--r--multimedia/dvdstyler/dvdstyler-2.3rc2-nognome.patch11
-rw-r--r--multimedia/dvdstyler/dvdstyler.SlackBuild6
-rw-r--r--multimedia/dvdstyler/dvdstyler.info6
4 files changed, 19 insertions, 6 deletions
diff --git a/multimedia/dvdstyler/README b/multimedia/dvdstyler/README
index 97b3123973..c03ac824f0 100644
--- a/multimedia/dvdstyler/README
+++ b/multimedia/dvdstyler/README
@@ -2,5 +2,3 @@ DVDStyler is a cross-platform free DVD authoring application for the
creation of professional-looking DVDs. It allows not only burning of
video files on DVD that can be played practically on any standalone DVD
player, but also creation of individually designed DVD menus.
-
-Note that wxPython needs to have been built with the media library.
diff --git a/multimedia/dvdstyler/dvdstyler-2.3rc2-nognome.patch b/multimedia/dvdstyler/dvdstyler-2.3rc2-nognome.patch
new file mode 100644
index 0000000000..060cf5b2cd
--- /dev/null
+++ b/multimedia/dvdstyler/dvdstyler-2.3rc2-nognome.patch
@@ -0,0 +1,11 @@
+--- wxVillaLib/ThumbnailFactory.cpp.org 2012-08-20 07:10:49.071537020 +0200
++++ wxVillaLib/ThumbnailFactory.cpp 2012-08-20 07:11:27.153489557 +0200
+@@ -251,7 +251,7 @@
+ free(fnameEscaped);
+ wxString fname = filename;
+ if (info->mimeType == _T("concat"))
+- fname = filename.substr(7).BeforeFirst(wxT('|'));
++ fname = filename.Mid(7).BeforeFirst(wxT('|'));
+ info->mtime = wxFileName(fname).GetModificationTime();
+ #endif
+ return info;
diff --git a/multimedia/dvdstyler/dvdstyler.SlackBuild b/multimedia/dvdstyler/dvdstyler.SlackBuild
index dae4087b27..2458afec56 100644
--- a/multimedia/dvdstyler/dvdstyler.SlackBuild
+++ b/multimedia/dvdstyler/dvdstyler.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=dvdstyler
SPRGNAM=DVDStyler
-VERSION=${VERSION:-2.2b2}
+VERSION=${VERSION:-2.3rc2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -57,6 +57,10 @@ if [ -f /usr/include/libavfilter/buffersink.h ]; then
sed -i "s|vsink_buffer\.h|buffersink.h|" src/mediatrc_ffmpeg.cpp
fi
+# This fixes build when gnome support is disabled
+# http://sourceforge.net/tracker/?func=detail&aid=3559741&group_id=92301&atid=600266
+patch -p0 < $CWD/dvdstyler-2.3rc2-nognome.patch
+
LDFLAGS="-ljpeg" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/dvdstyler/dvdstyler.info b/multimedia/dvdstyler/dvdstyler.info
index 127ca5b697..761280a327 100644
--- a/multimedia/dvdstyler/dvdstyler.info
+++ b/multimedia/dvdstyler/dvdstyler.info
@@ -1,8 +1,8 @@
PRGNAM="dvdstyler"
-VERSION="2.2b2"
+VERSION="2.3rc2"
HOMEPAGE="http://www.dvdstyler.org/"
-DOWNLOAD="http://download.sourceforge.net/dvdstyler/DVDStyler-2.2b2.tar.bz2"
-MD5SUM="63468530e58b440dafcb89dcd68743b7"
+DOWNLOAD="http://download.sourceforge.net/dvdstyler/DVDStyler-2.3rc2.tar.bz2"
+MD5SUM="2aaa5d717e51ad36900f8d543b9ae6a9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="dvdauthor ffmpeg libavc1394 libmspack libquicktime mjpegtools mpgtx wxPython wxsvg"