File k9copy-dvdread.patch of Package k9copy

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,13 @@ INCLUDE(FindXine)
 INCLUDE(FindAvformat)
 #INCLUDE(FindAvutil)
 INCLUDE(FindFFmpegScale)
-#INCLUDE(FindLibDvdread)
+
+include(FindPkgConfig)
+pkg_check_modules(LIBDVD REQUIRED dvdnav dvdread)
+MESSAGE(STATUS "Found dvd library ${LIBDVD_FOUND}")
+MESSAGE(STATUS "Found dvd library ${LIBDVD_LIBRARIES}")
+MESSAGE(STATUS "Found dvd include  ${LIBDVD_INCLUDE_DIRS}")
+include_directories(${LIBDVD_INCLUDE_DIRS})
 
 # usage: CHECK_INCLUDE_FILES (<header> <RESULT_VARIABLE> )
 CHECK_INCLUDE_FILES(inttypes.h      HAVE_INTTYPES_H)                    # inttypes.h
@@ -102,7 +108,6 @@ 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")
 
 
 #FINDAVFORMAT("avformat")
@@ -110,9 +115,6 @@ ENDIF (LIBDL_LIBRARY)
 #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/core )
 add_subdirectory( src/mpeg2)
 add_subdirectory(src/vamps)
@@ -127,7 +129,6 @@ add_subdirectory(po)
 add_subdirectory(doc)
 
 include_directories(
- ${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,7 +140,6 @@ 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/batch
 ${KDE4_INCLUDES} ${QT_INCLUDES}
 #${LIBDVDREAD_INCLUDE_DIR}/dvdread
@@ -159,34 +159,6 @@ set (subtitles_SRCS
    src/subtitles/k9subtitle2pgm.cpp
 )
 
-set (libdvdnav_SRCS
-#   src/dvdnav/decoder.c 
-#   src/dvdnav/dvdnav.c
-#   src/dvdnav/highlight.c
-#   src/dvdnav/navigation.c
-#   src/dvdnav/read_cache.c
-#   src/dvdnav/remap.c
-#   src/dvdnav/searching.c
-#   src/dvdnav/settings.c
-#   src/dvdnav/vm.c
-#   src/dvdnav/vmcmd.c
-#UPDATED TO CURRENT:
-src/libdvdnav-NOW/dvdnav.c
-src/libdvdnav-NOW/highlight.c
-src/libdvdnav-NOW/read_cache.c
-src/libdvdnav-NOW/searching.c
-src/libdvdnav-NOW/navigation.c
-src/libdvdnav-NOW/settings.c
-
-src/libdvdnav-NOW/vm/decoder.c  
-src/libdvdnav-NOW/vm/getset.c  
-src/libdvdnav-NOW/vm/play.c
-src/libdvdnav-NOW/vm/vm.c  
-src/libdvdnav-NOW/vm/vmcmd.c  
-src/libdvdnav-NOW/vm/vmget.c
-
-
-)
 
 set (vamps_SRCS
   src/vamps/k9fifo.cpp
@@ -194,25 +166,6 @@ set (vamps_SRCS
   src/vamps/k9vamps.cpp
 )
 
-set (dvdread_SRCS
-#   src/dvdread/dvd_input.c
-#   src/dvdread/dvd_reader.c
-#   src/dvdread/dvd_udf.c
-#   src/dvdread/ifo_read.c
-#   src/dvdread/md5.c
-#   src/dvdread/nav_read.c
- src/libdvdread-NOW/bitreader.c  
- src/libdvdread-NOW/md5.c
- src/libdvdread-NOW/ifo_print.c        
- src/libdvdread-NOW/nav_print.c
-
-   src/libdvdread-NOW/dvd_input.c
-   src/libdvdread-NOW/dvd_reader.c
-   src/libdvdread-NOW/dvd_udf.c
-   src/libdvdread-NOW/ifo_read.c
-   src/libdvdread-NOW/md5.c
-   src/libdvdread-NOW/nav_read.c
-)
 
 set (core_SRCS
   src/core/k9dvd.cpp
@@ -454,18 +407,10 @@ set (batch_SRCS
 
 
 set (k9copylib_SRCS
-#   ${libdvdnav_SRCS}
    ${core_SRCS}
    ${vamps_SRCS}
    ${mpeg2_SRCS}
    ${subtitles_SRCS}
-#   src/dvdread/dvd_input.c
-#   src/dvdread/dvd_reader.c
-#   src/dvdread/dvd_udf.c
-#   src/dvdread/ifo_read.c
-#   src/dvdread/md5.c
-#   src/dvdread/nav_read.c
-#   ${dvdread_SRCS}
    ${backup_SRCS}
 )
 
@@ -490,15 +435,11 @@ set (k9xineplayer_SRCS
 )
 
 
-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")
 add_library(k9copylib STATIC ${k9copylib_SRCS})
 target_link_libraries(k9copylib 
-			dvdread dvdnav
 			KF5::WidgetsAddons 	#Tier 1 
 			KF5::Su 		#Tier 3  
 			KF5::I18n 		#Tier 1
@@ -542,13 +483,12 @@ endif()
 ####### Static and non Static Library
 
 
-
 ################################
 
 if(QT5_BUILD)
 message("Qt5 Version")
-target_link_libraries(k9copy dvdread dvdnav k9copylib 	KF5::WidgetsAddons  	KF5::XmlGui 	KF5::IconThemes 	KF5::KIOCore KF5::KIOWidgets 	${PHONON_LIBRARY} 	KF5::I18n )
-target_link_libraries(k9play dvdread dvdnav k9copylib KF5::WidgetsAddons KF5::XmlGui) 							
+target_link_libraries(k9copy k9copylib 	KF5::WidgetsAddons  	KF5::XmlGui 	KF5::IconThemes 	KF5::KIOCore KF5::KIOWidgets 	${PHONON_LIBRARY} 	KF5::I18n ${LIBDVD_LIBRARIES})
+target_link_libraries(k9play k9copylib KF5::WidgetsAddons KF5::XmlGui ${LIBDVD_LIBRARIES})
 target_link_libraries(k9xineplayer KF5::WidgetsAddons KF5::XmlGui KF5::I18n Qt5::X11Extras ${XINE_LIBRARY} ${X11_X11_LIB} )
 else()															
 message("Qt4 Version")
--- a/src/mpeg2/k9plaympeg2.cpp
+++ b/src/mpeg2/k9plaympeg2.cpp
@@ -11,7 +11,7 @@
 //
 #include "k9plaympeg2.h"
 #include "kdecmpeg2.h"
-#include "dvdnav/dvdnav.h" //PM DVDNAV
+#include <dvdnav/dvdnav.h>
 
 #include <qapplication.h>