François Andriot
11 years ago
parent
53831bb045
commit
d27f007647
@ -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
|
||||
@ -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
|
||||
@ -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
|
||||
@ -0,0 +1,11 @@
|
||||
--- trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in.ROI 2013-08-04 20:37:52.076477391 +0200
|
||||
+++ trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in 2013-08-04 20:37:57.402529614 +0200
|
||||
@@ -2633,7 +2633,7 @@
|
||||
AC_DEFINE_UNQUOTED([VERSION_BRANCH], "$SS_DIRTAG", [MAJOR.MINOR part of version])
|
||||
AC_DEFINE_UNQUOTED([BUILD_FLAGS],"$target_cpu-$build_flags", [these are the build flags])
|
||||
|
||||
- globalkvircdir="\${datadir}/kvirc/$SS_DIRTAG"
|
||||
+ globalkvircdir="\${libdir}/kvirc/$SS_DIRTAG"
|
||||
AC_SUBST(globalkvircdir)
|
||||
|
||||
configdir="\${globalkvircdir}/config"
|
||||
@ -0,0 +1,33 @@
|
||||
--- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200
|
||||
+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200
|
||||
@@ -143,10 +143,10 @@
|
||||
*/
|
||||
|
||||
static const TQString
|
||||
- html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
|
||||
+ html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
|
||||
"<table class=\"query\">\n");
|
||||
static const TQString
|
||||
- html_form_end("<tr>\n"
|
||||
+ html_form_end_apt("<tr>\n"
|
||||
"\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
|
||||
"</tr>\n"
|
||||
"</table>\n"
|
||||
@@ -197,7 +197,7 @@
|
||||
if (online)
|
||||
stream << "<table class=\"queryform\"><tr><td>\n";
|
||||
|
||||
- stream << html_form_begin;
|
||||
+ stream << html_form_begin_apt;
|
||||
stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
|
||||
stream << make_html_form_line("search", i18n("Package search"));
|
||||
if (ext_form)
|
||||
@@ -206,7 +206,7 @@
|
||||
stream << make_html_form_line("fsearch", i18n("File search"));
|
||||
stream << make_html_form_line("show", i18n("Package info"));
|
||||
}
|
||||
- stream << html_form_end.arg( i18n("Search") );
|
||||
+ stream << html_form_end_apt.arg( i18n("Search") );
|
||||
|
||||
if (online)
|
||||
{
|
||||
Loading…
Reference in new issue