diff options
Diffstat (limited to 'redhat/applications/k9copy')
6 files changed, 232 insertions, 79 deletions
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec index 13f59ddd9..f03137ba4 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy-14.0.0.spec @@ -1,61 +1,109 @@ -# Default version for this component -%define tde_pkg k9copy +# +# spec file for package k9copy (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg k9copy +%define tde_prefix /opt/trinity +%define tde_appdir %{tde_datadir}/applications %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: DVD backup tool for Trinity +Epoch: %{tde_epoch} Version: 1.2.3 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: DVD backup tool for Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: k9copy-14.0.0-fix_k3b_link.patch -Patch2: k9copy-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: trinity-k3b-devel +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + # Warning: the target distribution must have ffmpeg ! BuildRequires: ffmpeg-devel Requires: ffmpeg +# DVDREAD support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}dvdread-devel +%else +BuildRequires: libdvdread-devel +%endif + +# MESA support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: mesaglu-devel +%endif +%if 0%{?suse_version} +BuildRequires: Mesa-libGL-devel +BuildRequires: Mesa-libGLU-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-Mesa-libGLU +%endif + %description k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 @@ -63,21 +111,26 @@ to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). This is the Trinity version. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .ftbfs # Removes internal dvdread headers -%__rm -rf dvdread +%__rm -rf "dvdread" + +# Fix permissions on doc files +chmod -x AUTHORS COPYING %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -123,17 +176,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING @@ -146,5 +188,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec index bd6788c62..a7a026ab9 100644 --- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec +++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k9copy %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: DVD backup tool for Trinity Version: 1.2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -81,7 +76,7 @@ This is the Trinity version. %__rm -rf dvdread %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -149,30 +144,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-3 -- Initial release for TDE 3.5.13.1 - -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2 -- Add support for MGA2 and MDV2011 -- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0] -- Fix FTBFS [Commit #62acebb7] -- Fix 'format not a string literal' error [Commit #d9ed8b32] -- Fix remaining string format errors [Commit #a8e98ad9] -- Fix another string format error [Commit #b3bb8a8f] -- Fix FTBFS [Commit #ca864ede] -- Fix format string error [Commit #a016df82] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2 -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch new file mode 100644 index 000000000..f6a362d40 --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch @@ -0,0 +1,14 @@ +--- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI 2013-07-29 21:52:57.859615464 +0200 ++++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h 2013-07-29 21:57:19.206481299 +0200 +@@ -43,7 +43,11 @@ + #else + typedef int (*av_find_stream_info_t)(AVFormatContext *); + #endif ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0) ++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID); ++#else + typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID); ++#endif + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0) + typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **); + #else diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch new file mode 100644 index 000000000..f7858c0a0 --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch @@ -0,0 +1,11 @@ +--- trinity-k9copy-3.5.13.2/src/Makefile.am.ORI 2013-06-17 20:59:49.620929488 +0200 ++++ trinity-k9copy-3.5.13.2/src/Makefile.am 2013-06-17 21:00:11.150425671 +0200 +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) ++ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch new file mode 100644 index 000000000..4dfb39787 --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch @@ -0,0 +1,18 @@ +--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200 ++++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200 +@@ -21,6 +21,9 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#ifndef __MPEG2_INTERNAL_H__ ++#define __MPEG2_INTERNAL_H__ ++ + /* macroblock modes */ + #define MACROBLOCK_INTRA 1 + #define MACROBLOCK_PATTERN 2 +@@ -298,3 +301,5 @@ + extern mpeg2_mc_t mpeg2_mc_altivec; + extern mpeg2_mc_t mpeg2_mc_alpha; + extern mpeg2_mc_t mpeg2_mc_vis; ++ ++#endif // __MPEG2_INTERNAL_H__ diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch new file mode 100644 index 000000000..0cf01006e --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch @@ -0,0 +1,102 @@ +--- ./k9author/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9author/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -14,5 +14,5 @@ + k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \ + k9menueditor.h k9newdvd.h k9newtitle.h k9title.h + libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI) +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \ + -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes) +--- ./k9decmpeg/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9decmpeg/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -12,7 +12,7 @@ + motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \ + mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \ + uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ + -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy + + noinst_HEADERS = k9decodethread.h k9plaympeg2.h +--- ./k9devices/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9devices/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ + $(HAL_INCS) $(K3B_INCS) $(all_includes) + METASOURCES = AUTO + libk9devices_la_LDFLAGS = $(all_libraries) +--- ./k9Mplayer/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9Mplayer/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes) ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes) + METASOURCES = AUTO + + noinst_LTLIBRARIES = libk9mplayer.la +--- ./k9vamps/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9vamps/Makefile.am 2013-07-28 20:05:20.858621351 +0200 +@@ -7,6 +7,6 @@ + noinst_LTLIBRARIES = libk9vamps.la + libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \ + k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ + -I$(top_srcdir)/libk9copy + noinst_HEADERS = k9requant.h ac.h k9fifo.h +--- ./libdvdnav/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./libdvdnav/Makefile.am 2013-07-28 20:05:20.858621351 +0200 +@@ -11,4 +11,4 @@ + + + +-INCLUDES = -I$(top_srcdir)/dvdread ++INCLUDES = -I/usr/include/dvdread +--- ./libk9copy/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./libk9copy/Makefile.am 2013-07-28 20:05:20.858621351 +0200 +@@ -24,6 +24,6 @@ + k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h + + +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \ + -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav + libk9copy_la_LDFLAGS = $(all_libraries) +--- ./src/Makefile.am.dvdread 2013-07-28 20:05:20.855621729 +0200 ++++ ./src/Makefile.am 2013-07-28 20:09:10.620642017 +0200 +@@ -1,5 +1,5 @@ + # set the include path for X, qt and KDE +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \ + -I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \ + -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes) + +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice ++ -ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities +--- ./Makefile.am.ORI 2013-07-28 20:15:29.961786846 +0200 ++++ ./Makefile.am 2013-07-28 20:15:43.375094511 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ ++SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ + po src + + $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs +@@ -29,11 +29,3 @@ + + AM_CXXFLAGS = -O0 -g3 + +- +- +- +- +- +- +- +-INCLUDES = -I$(top_srcdir)/dvdread |