RPM Packaging: update lots of applications

4 files changed, 168 insertions, 8 deletions

diff --git a/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch b/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch
new file mode 100644
index 000000000..057fad5b9
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch
@@ -0,0 +1,25 @@
+--- trinity-k9copy/k9author/k9avidecode.cpp.k9author	2013-07-21 09:56:44.000000000 +0200
++++ trinity-k9copy/k9author/k9avidecode.cpp	2013-08-02 12:16:55.398266088 +0200
+@@ -119,6 +119,13 @@
+     m_opened=false;
+ 
+     glibref++;
++    
++    m_FormatCtx = NULL;
++    m_CodecCtx = NULL;
++    m_Codec = NULL;
++    m_Frame = NULL;
++    m_FrameRGB = NULL;
++    m_buffer = NULL;
+ }
+ 
+ 
+@@ -148,7 +155,7 @@
+     // Open video file
+     if (
+ #       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
+-        avformat_open_input(&m_FormatCtx, _fileName.utf8(), 0, 0)!=0
++        avformat_open_input(&m_FormatCtx, _fileName.utf8(), NULL, NULL)!=0
+ #       else
+         av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0
+ #       endif
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch b/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
new file mode 100644
index 000000000..1ea7705ea
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
@@ -0,0 +1,11 @@
+--- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs	2013-07-21 09:56:44.000000000 +0200
++++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am	2013-08-02 11:00:55.291717387 +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_TDEUI) -ltdemdi $(LIBDL)
++	$(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
+ 
+ # this is where the desktop file will go 
+ shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch b/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch
new file mode 100644
index 000000000..ac0716353
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.0-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_TDEUI)
+-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) -I$(includedir) $(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)
+--- ./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
+--- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.dvdread	2013-08-02 11:01:48.000000000 +0200
++++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am	2013-08-02 11:03:44.081175118 +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 -I$(includedir) $(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_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
++	-ldvdread $(LIB_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
+ 
+ # this is where the desktop file will go 
+ shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 073c43dc2..44bbb284e 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -27,7 +27,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		DVD backup tool for Trinity
 Version:		1.2.3
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -41,14 +41,19 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		k9copy-3.5.13.2-fix_k3b_link.patch
+Patch1:			k9copy-14.0.0-fix_k3b_link.patch
+Patch2:			k9copy-3.5.13.2-ftbfs.patch
+Patch3:			k9copy-14.0.0-use_external_dvdread.patch
+Patch4:			k9copy-14.0.0-fix_author.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:	trinity-arts-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	trinity-k3b-devel
+
 # Warning: the target distribution must have ffmpeg !
 BuildRequires:	ffmpeg-devel
 Requires:		ffmpeg
@@ -66,7 +71,13 @@ This is the Trinity version
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch1 -p1 -b .ftbfs
+%patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .dvdread
+%patch4 -p1 -b .k9author
+
+# Removes internal dvdread headers
+%__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"
@@ -82,16 +93,24 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 if [ -d /usr/include/ffmpeg ]; then
 	export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
 fi
-
+ 
+# NOTICE: --enable-final causes FTBFS !
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
   --bindir=%{tde_bindir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --disable-final \
+  --enable-new-ldflags \
   --enable-closure \
-  --disable-k3bdevices
+  --enable-rpath \
+  --enable-gcc-hidden-visibility \
+  \
+  --enable-k3bdevices
 
 %__make %{?_smp_mflags} || %__make
 
@@ -131,9 +150,12 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-6
 - Initial release for TDE 14.0.0
 
+* 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