Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3a8949e6815c2330d02e74de4d78a5d43d59ca3
commit d3a8949e6815c2330d02e74de4d78a5d43d59ca3 Author: crazy <[EMAIL PROTECTED]> Date: Tue Apr 29 22:06:49 2008 +0200 dvdstyler-1.6.2-1-x86_64 * ffmpeg fallout * bump it while at it * added ffmpeg diff * added patch to fix the build diff --git a/source/xapps-extra/dvdstyler/FrugalBuild b/source/xapps-extra/dvdstyler/FrugalBuild index 64bb8b2..76bb995 100644 --- a/source/xapps-extra/dvdstyler/FrugalBuild +++ b/source/xapps-extra/dvdstyler/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 <[EMAIL PROTECTED]> pkgname=dvdstyler -pkgver=1.6.1_2 +pkgver=1.6.2 pkgrel=1 pkgdesc="DVDStyler is a crossplatform dvd authoring system." _F_sourceforge_dirname="dvdstyler" @@ -12,19 +12,23 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.dvdstyler.de"; makedepends=('dvdauthor' 'netpbm') -depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.9.0rc3' 'cdrtools' 'dvd+rw-tools' 'wxsvg>=1.0b10' 'libexif') +depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.9.0rc3' 'cdrtools' 'dvd+rw-tools' 'wxsvg>=1.0b10-2' 'libexif' 'ffmpeg>=20080427') license="GPL2" -source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/dvdstyler/DVDStyler-${pkgver}.tar.gz) +source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/dvdstyler/DVDStyler-${pkgver}.tar.gz \ + ffmpeg.patch missing-wx-include.patch) options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('4e671bb69ad81c1c208c7bfaafdae7ac9d5c259a') +sha1sums=('9019af416f3af9701c5176ee57c59ed61d8172b9' \ + 'cd189e8343f1f18611645b299b7c837b77ba034e' \ + 'fa0118603dbbad9f03bdc3a220ea7a54aca68c65') build() { + unset MAKEFLAGS Fcd DVDStyler-${pkgver} - Fpatchall touch NEWS || Fdie + Fpatchall Fautoreconf Fmake Fmakeinstall diff --git a/source/xapps-extra/dvdstyler/ffmpeg.patch b/source/xapps-extra/dvdstyler/ffmpeg.patch new file mode 100644 index 0000000..8074829 --- /dev/null +++ b/source/xapps-extra/dvdstyler/ffmpeg.patch @@ -0,0 +1,26 @@ +diff -Naur DVDStyler-1.6.2/configure.in DVDStyler-1.6.2-p/configure.in +--- DVDStyler-1.6.2/configure.in 2008-01-27 12:10:22.000000000 +0100 ++++ DVDStyler-1.6.2-p/configure.in 2008-04-29 19:00:42.000000000 +0200 +@@ -84,7 +84,7 @@ + AC_CHECK_LIB(avformat, av_register_all, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavformat])]) + AC_CHECK_LIB(avcodec, avcodec_decode_audio2, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavcodec])]) + AC_CHECK_LIB(swscale, sws_getContext) +-AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: ffmpeg/avcodec.h.])]) ++AC_CHECK_HEADERS(libavcodec/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: ffmpeg/avcodec.h.])]) + + CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir/$PACKAGE\\\"" + +diff -Naur DVDStyler-1.6.2/src/mediaenc_ffmpeg.cpp DVDStyler-1.6.2-p/src/mediaenc_ffmpeg.cpp +--- DVDStyler-1.6.2/src/mediaenc_ffmpeg.cpp 2008-04-28 23:15:50.000000000 +0200 ++++ DVDStyler-1.6.2-p/src/mediaenc_ffmpeg.cpp 2008-04-29 18:59:38.000000000 +0200 +@@ -24,8 +24,8 @@ + extern "C" { + #define __STDC_CONSTANT_MACROS + #define __STDC_LIMIT_MACROS +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/swscale.h> ++#include <libavformat/avformat.h> ++#include <libswscale/swscale.h> + } + + #define AUDIO_BUF_SIZE 50000 diff --git a/source/xapps-extra/dvdstyler/missing-wx-include.patch b/source/xapps-extra/dvdstyler/missing-wx-include.patch new file mode 100644 index 0000000..b401af7 --- /dev/null +++ b/source/xapps-extra/dvdstyler/missing-wx-include.patch @@ -0,0 +1,10 @@ +--- DVDStyler-1.6.2/src/Utils.cpp 2008-04-18 22:14:41.000000000 +0200 ++++ DVDStyler-1.6.2-p/src/Utils.cpp 2008-04-29 21:58:53.000000000 +0200 +@@ -12,6 +12,7 @@ + #include <wx/clipbrd.h> + #include <wx/mstream.h> + #include <wx/log.h> ++#include <wx/dataobj.h> + + void CopyXmlToClipboard(wxSvgXmlNode* node, wxString dataFormatId) { + wxMemoryOutputStream stream; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
