Bug#876470: oggvideotools: uses embedded code copy of libresample

[Jonas Smedegaard]

Source: oggvideotools
Version: 0.9.1-4
Severity: important

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

oggvideotools links to a locally embedded convenience copy of libresample.

Debian Policy §4.13 dicates that "Debian packaging should ensure that
binary packages reference the libraries already in Debian and the
convenience copy is not used".

Attached is a draft patch.  My test build however failed with "fatal
error: bzero.h: No such file or directory" so apparently it confuses
cmake somehow :-/

 - Jonas

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAlnFKTsACgkQLHwxRsGg
ASFlSA/6A6I5k5r1iUmzEKwlUIr+d7r3GLSvzOZ0fLI86rfLK4bGTa8CufW9fcy2
e9QzVOA7oP4/tpgqI4vOQUDTmVqsrwsX9zl6tX+TQ3Zo2rSMVmESIlfukE+AN/Q9
e8Qxozdw9hLTCHKpdfHWD7biUcqHjCxOfF85E6qp1tMbQZC26ujnGFGhF+a2wOlO
3imbcu08pjAs1eQJtKg7HdsVExYOgIROIkk62sT5f4klvMKDewX7Eeiuh0Vh1Z6X
lkLTRs/hag3MoSGgTZCfZGRqrdyMgBK8jB2TnbAfHjzceVwZG36yWW8bvpoiX7xO
+Igkty66QoLD0uywx7gygjUW3ZSFgL925jxbcOq8XDQSae8PLC+gFL4uqf88Tsfj
G466yOmqd+jByM6thTeJeenbKXbPO7+TjEKSfxFq6sk3hd/7dp9pcJgrmhwEDu9i
BlYCjaOt3AXIDhKR0rM4B2bjqxxzyrnAw4bq3/qOR92gjUoJuYoOAe5DfLatViKq
pr5iprVLGUPrd0HU8kiX7Vd4X+AVHZhDQtl2iVaHPFfPOJLyQDhuGiRRM4VlthfI
+ihEGmGun+ZO0ELhbAivDRRWn1hWp7ZD6pKNWXN7vNftgm2upsh5BkfuU/U64vtA
HJ9la/J9BbPLyfudjPHXv4TOKza/BUAXf8xmdT9jarXj/7CEGVI=
=UvJc
-----END PGP SIGNATURE-----
-------------- next part --------------
Description: Use system-shared libresample
Author: Jonas Smedegaard <dr at jones.dk>
Last-Update: 2017-09-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,6 @@
                       ${CMAKE_CURRENT_LIST_DIR}/ovt_vorbis
                       ${CMAKE_CURRENT_LIST_DIR}/ovt_theora
                       ${CMAKE_CURRENT_LIST_DIR}/main
-                      ${CMAKE_CURRENT_LIST_DIR}/libresample
 )
 
 ADD_SUBDIRECTORY ( base )
@@ -23,6 +22,5 @@
 ADD_SUBDIRECTORY ( ovt_vorbis )
 ADD_SUBDIRECTORY ( ovt_theora )
 ADD_SUBDIRECTORY ( main )
-ADD_SUBDIRECTORY ( libresample )
 
 
--- a/src/main/audioConverter.cpp
+++ b/src/main/audioConverter.cpp
@@ -3,7 +3,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "libresample/libresample.h"
+#include <libresample.h>
 #include "log.h"
 
 AudioConverter::AudioConverter()
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@
   pkg_check_modules ( VORBIS    vorbis>=1.2.3 )
   pkg_check_modules ( VORBISENC vorbisenc>=1.2.3 )
   pkg_check_modules ( OGG       ogg>=1.1.0 )
+  pkg_check_modules ( LIBRESAMPLE libresample )
   find_library ( GD_LIBRARY NAMES gd )
 ENDIF ( $ENV{MAKE_PACKAGE} )
 
@@ -99,6 +100,15 @@
   SET ( STOP_CONFIGURATION true )
 ENDIF ( OGG_FOUND )
 
+IF ( LIBRESAMPLE_FOUND )
+  MESSAGE ( STATUS "libresample library found" )
+  SET ( HAVE_LIBRESAMPLE 1 CACHE INTERNAL "" )
+  SET ( ALL_LIBS ${ALL_LIBS} ${LIBRESAMPLE_LIBRARIES} )
+ELSE ( LIBRESAMPLE_FOUND )
+  MESSAGE ( STATUS "ERROR: libresample library NOT found" )
+  SET ( STOP_CONFIGURATION true )
+ENDIF ( LIBRESAMPLE_FOUND )
+
 IF ( NOT ${GD_LIBRARY} MATCHES GD_LIBRARY-NOTFOUND )
   MESSAGE ( STATUS "GD library and header found" )
   SET ( HAVE_LIBGD 1 CACHE INTERNAL "" )