Author: firewing Update of /cvs/free/rpms/dvdstyler/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11769/devel Modified Files: .cvsignore dvdstyler.spec sources Added Files: dvdstyler-1.6.2-desktop.patch dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch dvdstyler-1.7.0-wxsvg-freeworld.patch Log Message: Working build for dvdstyler 1.7.0 dvdstyler-1.6.2-desktop.patch: --- NEW FILE dvdstyler-1.6.2-desktop.patch --- --- data/dvdstyler.desktop.old 2008-08-16 11:59:51.000000000 -0400 +++ data/dvdstyler.desktop 2008-08-16 11:59:20.000000000 -0400 @@ -1,11 +1,11 @@ [Desktop Entry] Version=1.0 Type=Application -Encoding=UTF-8 Name=DVD Styler Comment=Video DVD Production +Icon=dvdstyler -Icon=dvdstyler.png Exec=dvdstyler Terminal=false +Categories=AudioVideo; -Categories=Application;AudioVideo; StartupNotify=true +StartupWMClass=Dvdstyler dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch: --- NEW FILE dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch --- diff -up src/mediatrc_ffmpeg.cpp.ff src/mediatrc_ffmpeg.cpp --- src/mediatrc_ffmpeg.cpp.ff 2008-08-24 22:34:02.000000000 +0200 +++ src/mediatrc_ffmpeg.cpp 2008-10-15 22:25:03.000000000 +0200 @@ -958,8 +958,8 @@ bool wxFfmpegMediaTranscoder::Run(bool& if (!codec->codec_tag) { if ( !os->oformat->codec_tag || av_codec_get_id( - os->oformat->codec_tag, icodec->codec_tag) > 0 - || av_codec_get_tag(os->oformat->codec_tag, + const_cast<const struct AVCodecTag **>(os->oformat->codec_tag), icodec->codec_tag) > 0 + || av_codec_get_tag(const_cast<const struct AVCodecTag **>(os->oformat->codec_tag), icodec->codec_id) <= 0) codec->codec_tag = icodec->codec_tag; } dvdstyler-1.7.0-wxsvg-freeworld.patch: --- NEW FILE dvdstyler-1.7.0-wxsvg-freeworld.patch --- --- configure.in.orig 2008-10-15 22:59:08.000000000 -0400 +++ configure.in 2008-10-15 22:59:21.000000000 -0400 @@ -59,7 +59,7 @@ dnl check for wxSVG AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) -AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])]) +AC_CHECK_HEADER([wxSVG-freeworld/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG-freeworld library (rpmfusion.org) ***])]) dnl check gnomeui-2.0 CHECK_WX_BUILT_WITH_GTK2() --- ./wxVillaLib/ThumbnailFactory.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./wxVillaLib/ThumbnailFactory.cpp 2008-09-27 14:31:15.000000000 -0400 @@ -27,7 +27,7 @@ #include <libgnomeui/gnome-thumbnail.h> static GnomeThumbnailFactory* thumbnail_factory = NULL; #elif defined(WX_SVG) -#include <wxSVG/mediadec_ffmpeg.h> +#include <wxSVG-freeworld/mediadec_ffmpeg.h> #elif defined(FFMPEG) #include "mediadec_ffmpeg.h" #endif --- ./src/dvdstyler.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/dvdstyler.cpp 2008-09-27 14:31:15.000000000 -0400 @@ -17,8 +17,8 @@ #include <wxVillaLib/imagjpg.h> #include <wxVillaLib/utils.h> #include <wxVillaLib/ThumbnailFactory.h> -#include <wxSVG/SVGCanvas.h> -#include <wxSVG/mediadec_ffmpeg.h> +#include <wxSVG-freeworld/SVGCanvas.h> +#include <wxSVG-freeworld/mediadec_ffmpeg.h> #ifndef __WXWINCE__ #include <locale.h> --- ./src/MenuObject.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/MenuObject.cpp 2008-09-27 14:31:14.000000000 -0400 @@ -11,8 +11,8 @@ #include "Menu.h" #include <wxVillaLib/utils.h> -#include <wxSVG/svg.h> -#include <wxSVGXML/svgxmlhelpr.h> +#include <wxSVG-freeworld/svg.h> +#include <wxSVGXML-freeworld/svgxmlhelpr.h> #include <wx/mstream.h> #include <wx/filename.h> --- ./src/Utils.h.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/Utils.h 2008-09-27 14:31:14.000000000 -0400 @@ -11,7 +11,7 @@ #ifndef UTILS_H #define UTILS_H -#include <wxSVGXML/svgxml.h> +#include <wxSVGXML-freeworld/svgxml.h> const wxString DATAFORMAT_MENU = wxT("application/dvdstyler-menu"); const wxString DATAFORMAT_MENU_OBJECT = wxT("application/dvdstyler-menu-object"); --- ./src/DVD.h.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/DVD.h 2008-09-27 14:31:14.000000000 -0400 @@ -14,7 +14,7 @@ #include <wx/wx.h> #include <wx/image.h> #include <wx/dynarray.h> -#include <wxSVG/mediadec_ffmpeg.h> +#include <wxSVG-freeworld/mediadec_ffmpeg.h> #include "Menu.h" #include "Slideshow.h" --- ./src/MenuEditor.h.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/MenuEditor.h 2008-09-27 14:31:13.000000000 -0400 @@ -11,7 +11,7 @@ #ifndef MENUEDITOR_H #define MENUEDITOR_H -#include <wxSVG/svgctrl.h> +#include <wxSVG-freeworld/svgctrl.h> #include "DVD.h" class TitlesetManager; --- ./src/Menu.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/Menu.cpp 2008-09-27 14:31:13.000000000 -0400 @@ -13,9 +13,9 @@ #include "Palette3D.h" #include <wxVillaLib/SConv.h> #include <wxVillaLib/utils.h> -#include <wxSVG/svg.h> -#include <wxSVG/SVGCanvas.h> -#include <wxSVGXML/svgxmlhelpr.h> +#include <wxSVG-freeworld/svg.h> +#include <wxSVG-freeworld/SVGCanvas.h> +#include <wxSVGXML-freeworld/svgxmlhelpr.h> #include <wx/mstream.h> #include <wx/filename.h> --- ./src/Slideshow.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/Slideshow.cpp 2008-09-27 14:31:13.000000000 -0400 @@ -9,7 +9,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "Slideshow.h" -#include <wxSVGXML/svgxmlhelpr.h> +#include <wxSVGXML-freeworld/svgxmlhelpr.h> ////////////////////////////////////////////////////////////////////////////// --- ./src/ProgressDlg.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/ProgressDlg.cpp 2008-09-27 14:31:12.000000000 -0400 @@ -17,8 +17,8 @@ #include <wx/filename.h> #include <wx/file.h> #include <wx/regex.h> -#include <wxSVG/SVGDocument.h> -#include <wxSVG/mediadec_ffmpeg.h> +#include <wxSVG-freeworld/SVGDocument.h> +#include <wxSVG-freeworld/mediadec_ffmpeg.h> #include "mediaenc_ffmpeg.h" #include "mediatrc_ffmpeg.h" --- ./src/MenuEditor.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/MenuEditor.cpp 2008-09-27 14:31:12.000000000 -0400 @@ -17,8 +17,8 @@ #include <wxVillaLib/ImageProc.h> #include <wxVillaLib/Thumbnails.h> #include <wxVillaLib/utils.h> -#include <wxSVG/svg.h> -#include <wxSVGXML/svgxml.h> +#include <wxSVG-freeworld/svg.h> +#include <wxSVGXML-freeworld/svgxml.h> #include "math.h" #include <wx/dnd.h> #include <wx/utils.h> --- ./src/DVD.cpp.orig 2008-09-27 14:29:41.000000000 -0400 +++ ./src/DVD.cpp 2008-09-27 14:31:11.000000000 -0400 @@ -10,10 +10,10 @@ #include "DVD.h" #include "Config.h" -#include <wxSVGXML/svgxmlhelpr.h> +#include <wxSVGXML-freeworld/svgxmlhelpr.h> #include <wxVillaLib/utils.h> #include <sys/stat.h> -#include <wxSVG/mediadec_ffmpeg.h> +#include <wxSVG-freeworld/mediadec_ffmpeg.h> #define DATA_FILE(fname) wxFindDataFile(_T("data") + wxString(wxFILE_SEP_PATH) + fname) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Aug 2008 14:16:15 -0000 1.2 +++ .cvsignore 16 Oct 2008 04:18:53 -0000 1.3 @@ -1 +1 @@ -DVDStyler-1.5.1.tar.gz +DVDStyler-1.7.0.tar.bz2 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvdstyler.spec 3 Aug 2008 14:16:15 -0000 1.1 +++ dvdstyler.spec 16 Oct 2008 04:18:53 -0000 1.2 @@ -1,39 +1,48 @@ Name: dvdstyler -Version: 1.5.1 +Version: 1.7.0 Release: 3%{?dist} -Epoch: 1 -Summary: Cross-platform DVD authoring system +Summary: Cross-platform DVD authoring application Group: Applications/Multimedia -License: GPL+ +License: GPLv2+ URL: http://www.dvdstyler.de/ -Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.gz -Patch0: %{name}-1.5.1-desktop.patch +Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 +Patch0: dvdstyler-1.6.2-desktop.patch +Patch1: dvdstyler-1.7.0-wxsvg-freeworld.patch +Patch2: dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: wxGTK-devel >= 2.6.3 -BuildRequires: wxsvg-devel +# build BuildRequires: gettext +BuildRequires: automake +BuildRequires: autoconf +# libraries +BuildRequires: wxGTK-devel >= 2.6.3 +BuildRequires: wxsvg-freeworld-devel +BuildRequires: ffmpeg-devel +BuildRequires: libgnomeui-devel +# mpeg BuildRequires: mpgtx -BuildRequires: netpbm-progs BuildRequires: mjpegtools BuildRequires: dvdauthor +# iso/burn BuildRequires: mkisofs BuildRequires: dvd+rw-tools -BuildRequires: libgnomeui-devel +#images BuildRequires: libjpeg-devel +BuildRequires: libexif-devel +BuildRequires: netpbm-progs +# finally BuildRequires: desktop-file-utils + Requires: mpgtx Requires: netpbm-progs Requires: mjpegtools Requires: dvdauthor Requires: mkisofs Requires: dvd+rw-tools + # Optional, defaults to off in burn settings in 1.5.1 Requires(hint): dvdisaster -# This is not strictly true, but it's the default previewer, and mplayer -# doesn't support DVD menus, so... -Requires: xine %description DVDStyler is a cross-platform DVD menu creation GUI that allows @@ -44,19 +53,23 @@ %prep %setup -q -n DVDStyler-%{version} -%patch0 -p1 -# Q'n'd fix for configure/Makefile.in outdatedness in 1.5.1: -(echo all: ; echo install:) > install.win32/Makefile.in - +%patch0 -b .desktop +%patch1 -b .wxsvg-freeworld +%patch2 -b .ffmpeg-AVCodecTag %build -%configure --disable-dependency-tracking +export CFLAGS="$CXXFLAGS -I/usr/include/wxSVG-freeworld -L%{_libdir}/wxsvg-freeworld" +export CXXFLAGS="$CXXFLAGS -I/usr/include/wxSVG-freeworld -L%{_libdir}/wxsvg-freeworld" +./autogen.sh +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT + rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/dvdstyler # Desktop entry and icon are supposed to be installed by "make install" # in 1.5.1 (to paths we don't want) but are not due to configure/Makefile.in @@ -66,6 +79,7 @@ data/dvdstyler.desktop install -Dpm 644 data/dvdstyler.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/dvdstyler.png + %find_lang %{name} @@ -93,9 +107,25 @@ %{_datadir}/dvdstyler/ %{_datadir}/applications/*dvdstyler.desktop %{_datadir}/icons/hicolor/*x*/apps/dvdstyler.png - +%{_datadir}/pixmaps/dvdstyler.png +%{_mandir}/*/*.gz %changelog +* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-3 +- Add ffmpeg-devel and fix wxsvg-freeworld-devel BR +- Add patch to fix AVCodecTag conversion errors +- Update wxsvg-freeworld patch so dvdstyler can be built without wxsvg (and use + only wxsvg-freeworld instead) + +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-2 +- Rebuild for wxsvg 1.0b11 with ffmpeg enabled + +* Sat Sep 06 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.7.0-1 +- Update to 1.7.0 + +* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 1:1.6.2-1 +- Update to 1.6.2 + * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:1.5.1-3 - rebuild Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 14:16:15 -0000 1.2 +++ sources 16 Oct 2008 04:18:53 -0000 1.3 @@ -1 +0,0 @@ -8b683353b4a9db18d56cb0ddcb78d35e DVDStyler-1.5.1.tar.gz