[gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/files/

[gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/files/

[Alexis Ballier]

commit:     113facfd43b04d35c96148e0f509fcbc7dfc1e56
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 15 10:22:58 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 14:17:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113facfd

media-video/ccextractor: remove unused patches

 media-video/ccextractor/files/cflags.patch | 25 ---------------------
 media-video/ccextractor/files/zlib.patch   | 36 ------------------------------
 2 files changed, 61 deletions(-)

diff --git a/media-video/ccextractor/files/cflags.patch b/media-video/ccextractor/files/cflags.patch
deleted file mode 100644
index e482bdbe5fc..00000000000
--- a/media-video/ccextractor/files/cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- src.orig/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -31,7 +31,7 @@ aux_source_directory ("${PROJECT_SOURCE_
- 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} -Wall -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
- add_subdirectory (lib_ccx)
- 
- aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
-Index: src/lib_ccx/CMakeLists.txt
-===================================================================
---- src.orig/lib_ccx/CMakeLists.txt
-+++ src/lib_ccx/CMakeLists.txt
-@@ -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} -Wall -std=gnu99")
- 
- if (WITH_FFMPEG)
-   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")

diff --git a/media-video/ccextractor/files/zlib.patch b/media-video/ccextractor/files/zlib.patch
deleted file mode 100644
index d2dfd2a3adb..00000000000
--- a/media-video/ccextractor/files/zlib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- src.orig/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -25,7 +25,6 @@ include_directories ("${PROJECT_SOURCE_D
- 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
-@@ -48,7 +47,7 @@ find_package (PkgConfig)
- if(PKG_CONFIG_FOUND)
-   pkg_check_modules(PNG libpng )
-   if(PNG_FOUND)
--    set (EXTRA_LIBS ${EXTRA_LIBS} png)
-+    set (EXTRA_LIBS ${EXTRA_LIBS} png z)
-   else (PNG_FOUND)
-     include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
-     include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
-Index: src/lib_ccx/CMakeLists.txt
-===================================================================
---- src.orig/lib_ccx/CMakeLists.txt
-+++ src/lib_ccx/CMakeLists.txt
-@@ -47,8 +47,8 @@ file (WRITE ccx.pc "prefix=${CMAKE_INSTA
-                   "Description: Closed Caption Extraction library\n"
-                   "Version: 0.75\n"
-                   "Cflags: -I\${includedir}/\n"
--                  "Libs: -L\${libdir} -lccx -lpng\n"
--                  "Libs.private: -lpng\n"
-+                  "Libs: -L\${libdir} -lccx -lpng -lz\n"
-+                  "Libs.private: -lpng -lz\n"
-                   )
- 
- install (TARGETS ccx DESTINATION lib)