[SCM] k9copy packaging branch, master, updated. a0cb4d309d159bb431ad423b37f0f7bdcae4a533
Eshat Cakar
eshat-guest at alioth.debian.org
Tue Jan 3 17:40:38 UTC 2012
The following commit has been merged in the master branch:
commit 563aa145cb57d04538608a615abfa7fb82c3b557
Author: Eshat Cakar <info at eshat.de>
Date: Tue Jan 3 17:39:22 2012 +0100
refresh link_libav_directly.patch
---
debian/patches/link_libav_directly.patch | 49 +++++++++++++++--------------
debian/patches/series | 1 -
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/debian/patches/link_libav_directly.patch b/debian/patches/link_libav_directly.patch
index d66df1d..4347c62 100644
--- a/debian/patches/link_libav_directly.patch
+++ b/debian/patches/link_libav_directly.patch
@@ -3,25 +3,23 @@ Author: Reinhard Tartler
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -15,11 +15,15 @@ INCLUDE(CMakeDetermineSystem)
+@@ -16,11 +16,13 @@
INCLUDE(CheckIncludeFiles)
INCLUDE(FindLibMpeg2)
INCLUDE(FindXine)
-INCLUDE(FindAvcodec)
-INCLUDE(FindAvformat)
-+#INCLUDE(FindAvcodec)
-+#INCLUDE(FindAvformat)
INCLUDE(FindFFmpegScale)
#INCLUDE(FindLibDvdread)
-+#use pkg-config to find various modes
-+INCLUDE(FindPkgConfig OPTIONAL)
++#use pkg-config to find various modes
++INCLUDE(FindPkgConfig OPTIONAL)
+pkg_check_modules(LIBAV REQUIRED libavformat libavcodec libavutil libswscale)
+
- set (VERSION 2.3.7)
+ set (VERSION 2.3.8)
-@@ -65,9 +69,6 @@ ENDIF (LIBDL_LIBRARY)
+@@ -66,9 +68,6 @@
#FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")
@@ -31,7 +29,7 @@ Author: Reinhard Tartler
add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
add_subdirectory( src/dvdnav)
add_subdirectory( src/core )
-@@ -350,7 +351,7 @@ kde4_add_executable(k9xineplayer ${k9xin
+@@ -351,7 +350,7 @@
MESSAGE(STATUS "Found library solid: ${KDE4_SOLID_LIBS}")
@@ -42,7 +40,7 @@ Author: Reinhard Tartler
--- a/src/import/k9avidecode.cpp
+++ b/src/import/k9avidecode.cpp
-@@ -10,17 +10,12 @@
+@@ -10,15 +10,12 @@
//
//
#include "k9avidecode.h"
@@ -52,15 +50,13 @@ Author: Reinhard Tartler
#include "k9common.h"
#ifdef HAVE_SWSCALE
--
+
-#include "swscale.h"
-
static int sws_flags = SWS_BICUBIC;
--
- #endif
- void av_free_packet_internal(AVPacket *pkt)
-@@ -35,64 +30,9 @@ void av_free_packet_internal(AVPacket *p
+ #endif
+@@ -35,67 +32,8 @@
k9AviDecode::k9AviDecode(QObject *parent, const char *)
: QObject(parent) {
@@ -72,23 +68,25 @@ Author: Reinhard Tartler
- CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //| RTLD_GLOBAL
- FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
-#ifdef HAVE_SWSCALE
-- SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
+- SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
+- if (SwscaleHandle==0)
+- SwscaleHandle=dlopen("libswscale.so.2",RTLD_LAZY);
-#endif
- }
m_error="";
QStringList errs;
- if (!CodecHandle) {
-- errs << i18n("Cannot open then library %1").arg("libavcodec");
+- errs << i18n("Cannot open the library %1").arg("libavcodec");
- }
- if (!FormatHandle ) {
-- errs << i18n("Cannot open then library %1").arg("libavformat");
+- errs << i18n("Cannot open the library %1").arg("libavformat");
- }
-#ifdef HAVE_SWSCALE
- if (!SwscaleHandle) {
-- errs << i18n("Cannot open then library %1").arg("libswscale");
+- errs << i18n("Cannot open the library %1").arg("libswscale");
- }
-#endif
-
+-
- av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
- av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
- av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
@@ -100,11 +98,12 @@ Author: Reinhard Tartler
- avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
- av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
- avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
+- if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
-#ifndef HAVE_SWSCALE
- img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
-//if img_convert is null (deprecated in ffmpeg), we need libswscale
- if (!img_convert)
-- errs << i18n("Cannot open then library %1").arg("libswscale");
+- errs << i18n("Cannot open the library %1").arg("libswscale");
-#endif
- av_free = (av_free_t)dlsym(CodecHandle,"av_free");
- av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
@@ -125,7 +124,7 @@ Author: Reinhard Tartler
if (errs.count() >0) {
m_error=errs.join("
");
k9Dialogs::error(m_error,"k9copy",QStringList());
-@@ -101,28 +41,12 @@ k9AviDecode::k9AviDecode(QObject *parent
+@@ -104,28 +42,12 @@
av_register_all();
m_opened=false;
@@ -156,7 +155,7 @@ Author: Reinhard Tartler
bool k9AviDecode::open(const QString & _fileName) {
--- a/src/import/k9avidecode.h
+++ b/src/import/k9avidecode.h
-@@ -14,49 +14,24 @@
+@@ -14,49 +14,25 @@
#include "k9common.h"
#include <qobject.h>
@@ -171,15 +170,17 @@ Author: Reinhard Tartler
#include <QObject>
#ifdef HAVE_SWSCALE
-#include <swscale.h>
++
+extern "C" {
+#include <libswscale/swscale.h>
+}
++
#endif
/**
@author Jean-Michel PETIT <k9copy at free.fr>
*/
-
+-
-//typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
-typedef void (*av_register_all_t) (void);
-typedef int64_t (*av_gettime_t) (void);
@@ -214,7 +215,7 @@ Author: Reinhard Tartler
class k9AviDecode : public QObject
{
Q_OBJECT
-@@ -76,36 +51,6 @@ public:
+@@ -76,36 +52,6 @@
QString getError() const;
private:
diff --git a/debian/patches/series b/debian/patches/series
index 8e93c3b..541431f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ fix-deprecated-func.patch
fix-ftbfs-kfreebsd.patch
german-spelling-error.patch
fix-desktop-files.patch
-rename_deprecated_var.patch
link_libav_directly.patch
--
k9copy packaging
More information about the pkg-kde-commits
mailing list