Applied RPMFusion patches to fix package

9 files changed, 453 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..ca177f922791
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,45 @@
+# Generated by mksrcinfo v8
+# Thu Jan  5 16:08:21 UTC 2017
+pkgbase = k9copy
+	pkgdesc = A small utility to copy DVD
+	pkgver = 3.0.3
+	pkgrel = 1
+	url = http://sourceforge.net/projects/k9copy-reloaded/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = cmake
+	makedepends = extra-cmake-modules
+	makedepends = kdoctools
+	depends = kdesu
+	depends = hicolor-icon-theme
+	depends = kio
+	depends = libmpeg2
+	depends = xine-lib
+	depends = dvd+rw-tools
+	depends = dvdauthor
+	depends = libdvdnav
+	depends = kdelibs4support
+	optdepends = libdvdcss: for decoding encrypted DVDs
+	provides = k9copy-reloaded
+	conflicts = k9copy-frameworks
+	conflicts = k9copy-kde4
+	source = http://sourceforge.net/projects/k9copy-reloaded/files/k9copy-3.0.3.tar.gz
+	source = k9copy-ffmpeg3andgcc6.patch
+	source = k9copy-FindAv.patch
+	source = k9copy-mimetype.patch
+	source = k9copy-qt5.patch
+	source = k9copy-tempdir.patch
+	source = unbundled_dvdread_dvdnav.patch
+	source = set_cancel_button_fix.patch
+	sha256sums = 4f1f8bc1ed22464a72382924aa23420c0bb94c2360af750a03454f187936e036
+	sha256sums = e6ea13c74b39e160d5eee7c106b2122f4a289aae37981ee176bc74ed8c959812
+	sha256sums = 61900fabe8534c506432ffc51a4e0bb49f231bdc04e2182b79383067404db703
+	sha256sums = 82c21ec5a2f0715803e72f8a35271fc3bc8d26a7b6e4ae8f8b24a8d0bf4faac0
+	sha256sums = e16536294c41446dc141572f52cc5efd67fcb4fb99e082804786c64fe2fa4729
+	sha256sums = 4eaabf10b3bfd3cce0b1ac176a2e4e038f03d0ca4d0f96b67897c20cdfc756f9
+	sha256sums = 6c3c72b03a4d4ff1c961416ad8030977e6f41d2d3304f8be181866ee546b5439
+	sha256sums = f03945f611650f2cfb76e479ce49aeb0b1815634025e35585d805f0ae5dcbdb5
+
+pkgname = k9copy
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..5941786e1727
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: twa022 <twa022 at gmail dot com>
+
+pkgname=k9copy
+pkgver=3.0.3
+pkgrel=1
+pkgdesc="A small utility to copy DVD"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/k9copy-reloaded/"
+license=('GPL')
+depends=('kdesu' 'hicolor-icon-theme' 'kio' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor' 'libdvdnav' 'kdelibs4support')
+optdepends=('libdvdcss: for decoding encrypted DVDs')
+makedepends=('cmake' 'extra-cmake-modules' 'kdoctools')
+provides=('k9copy-reloaded')
+conflicts=('k9copy-frameworks' 'k9copy-kde4')
+source=("http://sourceforge.net/projects/k9copy-reloaded/files/$pkgname-$pkgver.tar.gz"
+        'k9copy-ffmpeg3andgcc6.patch'
+        'k9copy-FindAv.patch'
+        'k9copy-mimetype.patch'
+        'k9copy-qt5.patch'
+        'k9copy-tempdir.patch'
+        'unbundled_dvdread_dvdnav.patch'
+        'set_cancel_button_fix.patch')
+
+sha256sums=('4f1f8bc1ed22464a72382924aa23420c0bb94c2360af750a03454f187936e036'
+            'e6ea13c74b39e160d5eee7c106b2122f4a289aae37981ee176bc74ed8c959812'
+            '61900fabe8534c506432ffc51a4e0bb49f231bdc04e2182b79383067404db703'
+            '82c21ec5a2f0715803e72f8a35271fc3bc8d26a7b6e4ae8f8b24a8d0bf4faac0'
+            'e16536294c41446dc141572f52cc5efd67fcb4fb99e082804786c64fe2fa4729'
+            '4eaabf10b3bfd3cce0b1ac176a2e4e038f03d0ca4d0f96b67897c20cdfc756f9'
+            '6c3c72b03a4d4ff1c961416ad8030977e6f41d2d3304f8be181866ee546b5439'
+            'f03945f611650f2cfb76e479ce49aeb0b1815634025e35585d805f0ae5dcbdb5')
+
+prepare() {
+	# Apply Fedora patches (https://github.com/rpmfusion/k9copy)
+    cd "$srcdir/$pkgname"
+
+	msg "Applying patch k9copy-ffmpeg3andgcc6.patch"
+	patch -Np1 -i ../k9copy-ffmpeg3andgcc6.patch
+
+	msg "Applying patch k9copy-FindAv.patch"
+	patch -Np1 -i ../k9copy-FindAv.patch
+
+	msg "Applying patch k9copy-mimetype.patch"
+	patch -Np1 -i ../k9copy-mimetype.patch
+
+	msg "Applying patch k9copy-qt5.patch"
+	patch -Np1 -i ../k9copy-qt5.patch
+
+	#msg "Applying patch k9copy-tempdir.patch"
+	#patch -Np0 -i ../k9copy-tempdir.patch
+
+	msg "Applying patch unbundled_dvdread_dvdnav.patch"
+	patch -Np1 -i ../unbundled_dvdread_dvdnav.patch
+
+	msg "Applying patch unbundled_dvdread_dvdnav.patch"
+	patch -uNp2 -r- -i ../set_cancel_button_fix.patch
+}
+
+build(){
+    cd "$srcdir/$pkgname"
+
+    # Fix desktop files
+    sed -e 's|Name=k9copy|Name=K9copy|g' \
+        -e '/xdg-open/d' -e '/Encoding/d' -e '/MimeTypes/d' \
+        -i k9copy{,_assistant}.desktop
+
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DQT5_BUILD=ON
+#    -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5
+    make
+}
+
+package(){
+    cd "$srcdir/$pkgname"
+    make DESTDIR="$pkgdir" install
+}
diff --git a/k9copy-FindAv.patch b/k9copy-FindAv.patch
new file mode 100644
index 000000000000..d23d9f404133
--- /dev/null
+++ b/k9copy-FindAv.patch
@@ -0,0 +1,72 @@
+--- k9copy/cmake/FindAvformat.cmake.orig	2014-09-29 16:00:12.000000000 +0100
++++ k9copy/cmake/FindAvformat.cmake	2015-05-28 19:42:03.942426473 +0100
+@@ -1,33 +1,35 @@
+-# - Try to find LibAvformat
+-# Once done this will define
+-#  LIBAVFORMAT_FOUND - System has LibAvformat
+-#  LIBAVFORMAT_INCLUDE_DIRS - The LibAvformat include directories
+-#  LIBAVFORMAT_LIBRARIES - The libraries needed to use LibAvformat
+-#  LIBAVFORMAT_DEFINITIONS - Compiler switches required for using LibAvformat
+-
+-#find_package(PkgConfig)
+-#pkg_check_modules(PC_LIBAVFORMAT QUIET libAvFormat)
+-#set(LIBAVFORMAT_DEFINITIONS ${PC_LIBAVFORMAT_CFLAGS_OTHER})
+-
+-#find_path(LIBAVFORMAT_INCLUDE_DIR ffmpeg/libAvformat/avformat.h
+-#          HINTS ${PC_LIBAVFORMAT_INCLUDEDIR} ${PC_LIBAVFORMAT_INCLUDE_DIRS}
+-#          PATH_SUFFIXES ffmpeg )
+-
+-#find_library(LIBAVFORMAT_LIBRARY NAMES libavformat libAvFormat LibAvformat
+-#             HINTS ${PC_LIBAVFORMAT_LIBDIR} ${PC_LIBAVFORMAT_LIBRARY_DIRS} )
+-
+-#set(LIBAVFORMAT_LIBRARIES ${LIBAVFORMAT_LIBRARY} )
+-#set(LIBAVFORMAT_INCLUDE_DIRS ${LIBAVFORMAT_INCLUDE_DIR} )
+-
+-#include(FindPackageHandleStandardArgs)
+-# handle the QUIETLY and REQUIRED arguments and set LIBAVFORMAT_FOUND to TRUE
+-# if all listed variables are TRUE
+-#find_package_handle_standard_args(LibAvformat  DEFAULT_MSG
+-#                                  LIBAVFORMAT_LIBRARY LIBAVFORMAT_INCLUDE_DIR)
+-
+-#mark_as_advanced(LIBAVFORMAT_INCLUDE_DIR LIBAVFORMAT_LIBRARY )
+-
+-
+-INCLUDE(FindPkgConfig)
+-PKG_SEARCH_MODULE(LIBAVFORMAT REQUIRED libavformat)
+-INCLUDE_DIRECTORIES(${LIBAVFORMAT_INCLUDE_DIRS})
++MACRO (FINDAVFORMAT _lib)
++
++FIND_PATH(AVFORMAT_INCLUDE_DIR_FF "ffmpeg/avformat.h" PATHS)
++IF (AVFORMAT_INCLUDE_DIR_FF)
++      SET (AVFORMAT_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg")
++ELSE (AVFORMAT_INCLUDE_DIR_FF)
++      FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "libavformat/avformat.h" PATHS)
++      IF (AVFORMAT_INCLUDE_DIR_LAVC)
++          SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat")
++      ELSE (AVFORMAT_INCLUDE_DIR_LAVC)
++	  FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS)
++	  IF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
++	    SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat")
++	  ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
++      ENDIF (AVFORMAT_INCLUDE_DIR_LAVC)
++ENDIF (AVFORMAT_INCLUDE_DIR_FF)
++
++
++
++FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS ) 
++
++IF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY)
++   SET(INC_FOUND TRUE)
++ELSE (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY)
++      SET(INC_FOUND FALSE)
++ENDIF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY)
++
++
++IF (INC_FOUND)
++      MESSAGE(STATUS "Found include avformat.h: ${AVFORMAT_INCLUDE_DIR}")
++      MESSAGE(STATUS "Found library ${_lib}: ${AVFORMAT_LIBRARY}")
++ELSE (INC_FOUND)
++      MESSAGE(FATAL_ERROR "Could not find ${_lib}")
++ENDIF (INC_FOUND)
++ENDMACRO (FINDAVFORMAT _lib )
+\ No newline at end of file
diff --git a/k9copy-ffmpeg3andgcc6.patch b/k9copy-ffmpeg3andgcc6.patch
new file mode 100644
index 000000000000..68218a20a372
--- /dev/null
+++ b/k9copy-ffmpeg3andgcc6.patch
@@ -0,0 +1,74 @@
+--- k9copy/src/core/k9tools.cpp.orig	2016-07-04 03:37:07.537698816 +0100
++++ k9copy/src/core/k9tools.cpp	2016-07-04 03:37:15.044797764 +0100
+@@ -88,7 +88,7 @@ bool k9Tools::checkProgram(QString _prog
+     #if QT_VERSION >= 0x050000
+     bool res=QStandardPaths::findExecutable( _progName) !=NULL ;
+     #else // Qt4 Code
+-    bool res= KStandardDirs::findExe( _progName,NULL,false) !=NULL ;
++    bool res= KStandardDirs::findExe( _progName,NULL,0) !=NULL ;
+     #endif
+     if (_msg && !res)
+         k9Dialogs::error(i18n("Error starting program %1").arg(_progName),i18n("Running program"));
+--- k9copy/src/backup/k9dvdbackup.cpp.orig	2016-07-04 03:45:28.518294176 +0100
++++ k9copy/src/backup/k9dvdbackup.cpp	2016-07-04 03:48:20.856559514 +0100
+@@ -33,6 +33,7 @@
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <string.h>
++#include <math.h>
+ #include <qdir.h>
+ 
+ #include <kmessagebox.h>
+@@ -907,7 +908,8 @@ k9Vobu * k9DVDBackup::remapOffset(uint32
+ 
+ 
+         if ((vobu1 !=NULL) && (vobu2!=NULL)) {
+-            *_offset = abs(vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
++            *_offset = fabs(vobu1->newSector - vobu2->newSector);
++            *_offset |= maskOffset1;
+             *_offset |= maskOffset2;
+             return vobu2;
+         }
+--- k9copy/src/import/k9avidecode.cpp.orig	2016-07-04 03:53:55.963959712 +0100
++++ k9copy/src/import/k9avidecode.cpp	2016-07-04 04:09:58.766458043 +0100
+@@ -26,7 +26,6 @@ static int sws_flags = SWS_BICUBIC;
+ void av_free_packet_internal(AVPacket *pkt)
+ {
+     if (pkt) {
+-        if (pkt->destruct) pkt->destruct(pkt);
+         pkt->data = NULL; pkt->size = 0;
+     }
+ }
+@@ -238,14 +237,14 @@ bool k9AviDecode::open(const QString & _
+ 
+     int numBytes;
+ // Determine required buffer size and allocate buffer
+-    numBytes=avpicture_get_size(PIX_FMT_RGB24, m_CodecCtx->width,
++    numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, m_CodecCtx->width,
+                                 m_CodecCtx->height);
+     m_buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t));
+ 
+ // Assign appropriate parts of buffer to image planes in pFrameRGB
+ // Note that pFrameRGB is an AVFrame, but AVFrame is a superset
+ // of AVPicture
+-    avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, PIX_FMT_RGB24,
++    avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, AV_PIX_FMT_RGB24,
+                    m_CodecCtx->width, m_CodecCtx->height);
+ 
+  
+@@ -317,13 +316,13 @@ void k9AviDecode::readFrame(double _seco
+                     bFound=true;
+ #ifndef HAVE_SWSCALE
+                   // Convert the image from its native format to RGB
+-                    img_convert((AVPicture *)m_FrameRGB, PIX_FMT_RGB24,
++                    img_convert((AVPicture *)m_FrameRGB, AV_PIX_FMT_RGB24,
+                                 (AVPicture*)m_Frame, m_CodecCtx->pix_fmt,
+                                 m_CodecCtx->width, m_CodecCtx->height);
+                     SaveFrame(m_FrameRGB, m_CodecCtx->width,
+                               m_CodecCtx->height);
+ #else
+-		    toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL);
++		    toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, AV_PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL);
+         		   sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize);
+                     // convert frame to QImage
+                     SaveFrame(m_FrameRGB, m_CodecCtx->width,
diff --git a/k9copy-mimetype.patch b/k9copy-mimetype.patch
new file mode 100644
index 000000000000..1c156d6055b1
--- /dev/null
+++ b/k9copy-mimetype.patch
@@ -0,0 +1,23 @@
+--- k9copy.orig/k9copy_assistant.desktop	2014-09-29 16:00:12.000000000 +0100
++++ k9copy/k9copy_assistant.desktop	2015-05-28 20:08:49.318602109 +0100
+@@ -14,9 +14,8 @@ GenericName[fr]=Backup de DVD Video
+ GenericName[tr]=DVD Vidyo Yedekleme Aracı
+ GenericName[ru]=Копирование с видео-DVD
+ GenericName[uk]=Копіювання відео-DVD
+-MimeTypes=
+ Terminal=false
+ Icon=k9copy
+ X-DocPath=k9copy/index.html
+ Categories=Qt;KDE;AudioVideo;DiscBurning;
+-X-KDE-StartupNotify=true
+\ No newline at end of file
++X-KDE-StartupNotify=true
+--- k9copy.orig/k9copy_assistant_open.desktop	2014-09-29 16:00:12.000000000 +0100
++++ k9copy/k9copy_assistant_open.desktop	2015-05-28 20:06:11.140619453 +0100
+@@ -11,4 +11,4 @@ NAme[uk]=Копіювати за доп�
+ [Desktop Entry]
+ X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]]
+ Type=Service
+-Actions=open;
+\ No newline at end of file
++Actions=open;
diff --git a/k9copy-qt5.patch b/k9copy-qt5.patch
new file mode 100644
index 000000000000..4944f4dde535
--- /dev/null
+++ b/k9copy-qt5.patch
@@ -0,0 +1,14 @@
+--- ./CMakeLists.txt.orig	2016-02-05 15:50:14.211451406 +0000
++++ ./CMakeLists.txt	2016-02-05 15:57:27.209837865 +0000
+@@ -1,9 +1,10 @@
++cmake_minimum_required(VERSION 3.1)
+ project(k9copy)
+ set (VERSION 3.0.3)
+ 
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ 
+-option(QT5_BUILD "Build with Qt5/KF5" OFF) 
++option(QT5_BUILD "Build with Qt5/KF5" ON) 
+ #Options ON or OFF OFF=QT4
+ 
+ if(QT5_BUILD)			#With above Setting this corresponds to my check of:     #if QT_VERSION >= 0x050000 
diff --git a/k9copy-tempdir.patch b/k9copy-tempdir.patch
new file mode 100644
index 000000000000..e9376cf2916d
--- /dev/null
+++ b/k9copy-tempdir.patch
@@ -0,0 +1,63 @@
+--- src/core/k9tools.cpp.org	2014-09-29 17:00:12.000000000 +0200
++++ src/core/k9tools.cpp	2015-12-19 19:18:40.474442195 +0100
+@@ -48,7 +48,7 @@
+ const QString  k9Tools::getTempPath() {
+ QString sPath;
+ 
+-sPath=QString("%1/%2/").arg(QDir::tempPath() + '/' + "k9copy/");
++sPath=QString("%1/%2/").arg(QDir::tempPath(),"k9copy/");
+ 
+ return sPath;
+ }
+--- src/vamps/k9fifo.cpp.org	2014-09-29 17:00:12.000000000 +0200
++++ src/vamps/k9fifo.cpp	2015-12-19 19:04:18.616261661 +0100
+@@ -11,6 +11,8 @@
+ //
+ #include "k9fifo.h"
+ #include <QDir>
++#include <errno.h>
++#include <KDebug>
+ 
+ uint64_t k9MemoryFifo::count() {
+ 	return m_count;
+@@ -134,12 +136,19 @@
+      m_wait.wait(&m_mutex);
+    }
+    m_wfile->seek(m_fstart);
+-   m_wfile->write((const char*)_buffer,_size);
++   int rc=m_wfile->write((const char*)_buffer,_size) ;
++   if (rc != (int) _size) {
++	kFatal() << QString("error writing to tempfile (%1)").arg(strerror (errno));
++	abort();
++   }
+    m_fstart=m_wfile->pos();
+    if (m_fstart > MAX_FILE_SIZE) {
+         m_wfile=new QTemporaryFile(QDir::cleanPath(m_output +"/k9b"));
+         m_wfile->setAutoRemove(true);
+-	m_wfile->open();
++	if(m_wfile->open() == false) {
++		kFatal() << QString("error creating tempfile in %1 (%1)").arg(QDir::cleanPath(m_output +"/k9b"), strerror (errno));
++		abort();
++	}
+ 	m_queue.enqueue(m_wfile);
+   	m_fstart=0;
+    }
+@@ -190,12 +199,17 @@
+ 	if (m_rfile) {
+           m_rfile->close();
+           delete m_rfile;
++	  m_rfile=NULL;
+         }
+ 	qDeleteAll(m_queue);
+ 
++
+ 	m_fstart=m_fend=0;
+         m_rfile=new QTemporaryFile(QDir::cleanPath(m_output +"/k9b"));
+         m_rfile->setAutoRemove(true);
+-	m_rfile->open();
++	if(m_rfile->open() == false) {
++		kFatal() << QString("error creating tempfile in %1 (%1)").arg(QDir::cleanPath(m_output +"/k9b"), strerror (errno));
++		abort();
++	}
+ 	m_start=m_end=0;
+ }
diff --git a/set_cancel_button_fix.patch b/set_cancel_button_fix.patch
new file mode 100644
index 000000000000..98845a3e71f3
--- /dev/null
+++ b/set_cancel_button_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur ./k9copy.orig/src/backup/k9execcopy.cpp ./k9copy/src/backup/k9execcopy.cpp
+--- ./k9copy.orig/src/backup/k9execcopy.cpp	2017-01-05 10:38:21.585287663 -0500
++++ ./k9copy/src/backup/k9execcopy.cpp	2017-01-05 10:38:56.048204571 -0500
+@@ -306,7 +306,7 @@
+ 
+ #if QT_VERSION >= 0x050000
+     m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() );
+-    m_progressDialog->setCancelButton(false);
++    m_progressDialog->setCancelButton(NULL);
+ 
+ #else
+     m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() );
diff --git a/unbundled_dvdread_dvdnav.patch b/unbundled_dvdread_dvdnav.patch
new file mode 100644
index 000000000000..ddc7533a9907
--- /dev/null
+++ b/unbundled_dvdread_dvdnav.patch
@@ -0,0 +1,75 @@
+--- k9copy/CMakeLists.txt.orig	2014-10-16 12:58:20.000000000 +0100
++++ k9copy/CMakeLists.txt	2015-05-28 19:42:03.942426473 +0100
+@@ -58,11 +58,11 @@ INCLUDE(CMakeDetermineSystem)
+ INCLUDE(CheckIncludeFiles)
+ INCLUDE(FindLibMpeg2)
+ INCLUDE(FindXine)
+-#INCLUDE(FindAvcodec)
++INCLUDE(FindAvcodec)
+ INCLUDE(FindAvformat)
+ #INCLUDE(FindAvutil)
+ INCLUDE(FindFFmpegScale)
+-#INCLUDE(FindLibDvdread)
++INCLUDE(FindLibDvdread)
+ 
+ # usage: CHECK_INCLUDE_FILES (<header> <RESULT_VARIABLE> )
+ CHECK_INCLUDE_FILES(inttypes.h      HAVE_INTTYPES_H)                    # inttypes.h
+@@ -102,17 +102,17 @@ ELSE (LIBDL_LIBRARY)
+   FIND_LIBRARY(LIBDL_LIBRARY NAMES "c" PATHS )
+   MESSAGE(STATUS "Found library libc: ${LIBDL_LIBRARY}")
+ ENDIF (LIBDL_LIBRARY)
+-#FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")
++FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")
+ 
+ 
+-#FINDAVFORMAT("avformat")
+-#FINDAVCODEC("avcodec")
++FINDAVFORMAT("avformat")
++FINDAVCODEC("avcodec")
+ #FINDAVUTIL("avutil")
+ 
+ add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
+-add_subdirectory( src/libdvdnav-NOW) #from dvdnav
+-add_subdirectory( src/libdvdnav-NOW/dvdnav)
+-add_subdirectory( src/libdvdnav-NOW/vm)
++#add_subdirectory( src/libdvdnav-NOW) #from dvdnav
++#add_subdirectory( src/libdvdnav-NOW/dvdnav)
++#add_subdirectory( src/libdvdnav-NOW/vm)
+ add_subdirectory( src/core )
+ add_subdirectory( src/mpeg2)
+ add_subdirectory(src/vamps)
+@@ -127,7 +127,7 @@ add_subdirectory(po)
+ add_subdirectory(doc)
+ 
+ include_directories(
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdnav-NOW #from dvdnav
++ #${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdnav-NOW #from dvdnav
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/devices
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/vamps
+@@ -139,10 +139,10 @@ include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/import
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/player
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/subtitles
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdread-NOW #from dvdread
++# ${CMAKE_CURRENT_SOURCE_DIR}/src/libdvdread-NOW #from dvdread
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/batch
+ ${KDE4_INCLUDES} ${QT_INCLUDES}
+-#${LIBDVDREAD_INCLUDE_DIR}/dvdread
++${LIBDVDREAD_INCLUDE_DIR}/dvdread
+  ${AVCODEC_INCLUDE_DIR}
+  ${AVFORMAT_INCLUDE_DIR}
+  ${AVUTIL_INCLUDE_DIR}
+@@ -490,9 +490,9 @@ set (k9xineplayer_SRCS
+ )
+ 
+ 
+-add_library(dvdread STATIC ${dvdread_SRCS})
+-add_library(dvdnav STATIC ${libdvdnav_SRCS})
+-target_link_libraries(dvdnav dvdread) 
++#add_library(dvdread STATIC ${dvdread_SRCS})
++#add_library(dvdnav STATIC ${libdvdnav_SRCS})
++#target_link_libraries(dvdnav dvdread) 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ if(QT5_BUILD)
+ message("Qt5 Version")