diff options
author | François Andriot <albator78@libertysurf.fr> | 2018-11-29 21:40:43 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2018-11-29 21:43:17 +0100 |
commit | 2e2f0b3c24a075376437f40fdaa19dae9fee6c04 (patch) | |
tree | 24db48e251119cb1b32cb4688c62562336149c09 /redhat/applications/k9copy | |
parent | 8d53102689c37ec7ba1528ed2098b1fcfafa2432 (diff) | |
download | tde-packaging-2e2f0b3c24a075376437f40fdaa19dae9fee6c04.tar.gz tde-packaging-2e2f0b3c24a075376437f40fdaa19dae9fee6c04.zip |
RPM: remove obsolete patches
Diffstat (limited to 'redhat/applications/k9copy')
4 files changed, 0 insertions, 145 deletions
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 deleted file mode 100644 index f6a362d40..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index f7858c0a0..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 4dfb39787..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 0cf01006e..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- ./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 |