commit: 45faa89268bc5fe45996dc034a497d2d0fac98aa
Author: Steve Dibb <beandog <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 18:58:49 2017 +0000
Commit: Steve Dibb <beandog <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 18:59:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45faa892
media-video/ccextractor: remove file collision headers
Fix file collision header install; update makefile patch, bug 617420
Package-Manager: Portage-2.3.0, Repoman-2.3.1
...ctor-0.85.ebuild => ccextractor-0.85-r1.ebuild} | 4 +-
.../files/ccextractor-0.85-makefile.patch | 76 ++++++++++++++++++++++
2 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/media-video/ccextractor/ccextractor-0.85.ebuild
b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
similarity index 87%
rename from media-video/ccextractor/ccextractor-0.85.ebuild
rename to media-video/ccextractor/ccextractor-0.85-r1.ebuild
index ea26c55c5ef..35c0f63e14f 100644
--- a/media-video/ccextractor/ccextractor-0.85.ebuild
+++ b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
@@ -25,11 +25,9 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}/src"
PATCHES=(
- "${FILESDIR}/zlib.patch"
- "${FILESDIR}/cflags.patch"
+ "${FILESDIR}/${P}-makefile.patch"
)
src_prepare() {
- rm -rf libpng zlib || die
cmake-utils_src_prepare
}
diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
new file mode 100644
index 00000000000..6937869180d
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
@@ -0,0 +1,76 @@
+--- ccextractor/src/CMakeLists.txt.orig 2017-07-25 12:22:29.294144514
-0600
++++ ccextractor/src/CMakeLists.txt 2017-07-25 12:23:33.979149436 -0600
+@@ -25,14 +25,13 @@
+ include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
+ include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/zvbi" SOURCEFILE)
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib" SOURCEFILE)
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_hash" SOURCEFILE)
+
+ # Adding some platform specific library path
+ link_directories (/opt/local/lib)
+ link_directories (/usr/local/lib)
+
+-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -g -std=gnu99
-Wno-write-strings -D_FILE_OFFSET_BITS=64")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_FILE_OFFSET_BITS=64")
+ add_subdirectory (lib_ccx)
+
+ aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
+@@ -43,24 +42,8 @@
+ set (EXTRA_LIBS ${EXTRA_LIBS} iconv)
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+-
+-find_package (PkgConfig)
+-if(PKG_CONFIG_FOUND)
+- pkg_check_modules(PNG libpng )
+- if(PNG_FOUND)
+- set (EXTRA_LIBS ${EXTRA_LIBS} png)
+- else (PNG_FOUND)
+- include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+- include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+- aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+- aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+- endif(PNG_FOUND)
+-else(PKG_CONFIG_FOUND)
+- include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+- include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+- aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+- aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-endif (PKG_CONFIG_FOUND)
++set (EXTRA_LIBS ${EXTRA_LIBS} png)
++set (EXTRA_LIBS ${EXTRA_LIBS} z)
+
+ ########################################################
+ # Build using FFmpeg libraries
+--- ccextractor/src/lib_ccx/CMakeLists.txt.orig 2017-07-25
12:32:32.803190443 -0600
++++ ccextractor/src/lib_ccx/CMakeLists.txt 2017-07-25 12:25:40.819159089
-0600
+@@ -1,6 +1,6 @@
+ cmake_policy (SET CMP0037 NEW)
+
+-set (CMAKE_C_FLAGS "-O0 -Wall -g -std=gnu99")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+
+ if (WITH_FFMPEG)
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
+@@ -37,20 +37,3 @@
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGPAC_CONFIG_DARWIN")
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-
+-
+-file (GLOB HeaderFiles *.h)
+-file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
+- "includedir=\${prefix}/include\n"
+- "libdir=\${prefix}/lib\n\n"
+- "Name: ccx\n"
+- "Description: Closed Caption Extraction library\n"
+- "Version: 0.75\n"
+- "Cflags: -I\${includedir}/\n"
+- "Libs: -L\${libdir} -lccx -lpng\n"
+- "Libs.private: -lpng\n"
+- )
+-
+-install (TARGETS ccx DESTINATION lib)
+-install (FILES ${HeaderFiles} DESTINATION include)
+-install (FILES ccx.pc DESTINATION lib/pkgconfig)
