diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-video/ccextractor/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-video/ccextractor/files')
-rw-r--r-- | media-video/ccextractor/files/ccextractor-0.68-libpng.patch | 11 | ||||
-rw-r--r-- | media-video/ccextractor/files/ccextractor-0.85-makefile.patch | 76 |
2 files changed, 87 insertions, 0 deletions
diff --git a/media-video/ccextractor/files/ccextractor-0.68-libpng.patch b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch new file mode 100644 index 000000000000..518d434df369 --- /dev/null +++ b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch @@ -0,0 +1,11 @@ +--- src/608_spupng.cpp.orig 2014-03-19 10:32:47.578960867 -0600
++++ src/608_spupng.cpp 2014-03-19 10:33:00.692179157 -0600
+@@ -490,7 +490,7 @@
+ {
+ unsigned int i;
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ return 0;
+
+ png_init_io (png_ptr, fppng);
\ No newline at end of file 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 000000000000..6937869180de --- /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) |