Request 2311 (accepted)

Overview

Request 2311 (accepted)

- Use pkgconfig for ffmpeg BuildRequires

Created by olh about 9 years ago
In state accepted
Package maintainer: blinry

Submit nordlicht

Submit package home:olh:pkgconfig-ffmpeg / nordlicht to package Multimedia / nordlicht

nordlicht.changes Changed

nordlicht.spec Changed

nordlicht-ffmpeg-deps.patch Added

@@ -0,0 +1,64 @@
+Index: nordlicht-0.3.5/CMakeLists.txt
+===================================================================
+--- nordlicht-0.3.5.orig/CMakeLists.txt
++++ nordlicht-0.3.5/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(LIB_SUFFIX "" CACHE STRING "Suffix o
+ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where library will be installed")
+ 
+ find_package(Threads REQUIRED)
+-find_package(FFmpeg COMPONENTS AVUTIL AVFORMAT AVCODEC SWSCALE REQUIRED)
++find_package(FFmpeg COMPONENTS AVFORMAT AVCODEC SWSCALE REQUIRED)
+ find_package(PNG REQUIRED)
+ find_package(Popt REQUIRED)
+ 
+Index: nordlicht-0.3.5/cmake/FindFFmpeg.cmake
+===================================================================
+--- nordlicht-0.3.5.orig/cmake/FindFFmpeg.cmake
++++ nordlicht-0.3.5/cmake/FindFFmpeg.cmake
+@@ -1,5 +1,5 @@
+ # vim: ts=2 sw=2
+-# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC)
++# - Try to find the required ffmpeg components(default: AVFORMAT, AVCODEC)
+ #
+ # Once done this will define
+ #  FFMPEG_FOUND         - System has the all required components.
+@@ -9,10 +9,7 @@
+ #
+ # For each of the components it will additionally set.
+ #   - AVCODEC
+-#   - AVDEVICE
+ #   - AVFORMAT
+-#   - AVUTIL
+-#   - POSTPROCESS
+ #   - SWSCALE
+ # the following variables will be defined
+ #  <component>_FOUND        - System has <component>
+@@ -32,7 +29,7 @@ include(FindPackageHandleStandardArgs)
+ 
+ # The default components were taken from a survey over other FindFFMPEG.cmake files
+ if (NOT FFmpeg_FIND_COMPONENTS)
+-  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL)
++  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT)
+ endif ()
+ 
+ #
+@@ -100,10 +97,7 @@ if (NOT FFMPEG_LIBRARIES)
+   # Check for all possible component.
+   find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+   find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
+-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
+   find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
+-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
+ 
+   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
+   foreach (_component ${FFmpeg_FIND_COMPONENTS})
+@@ -134,7 +128,7 @@ if (NOT FFMPEG_LIBRARIES)
+ endif ()
+ 
+ # Now set the noncached _FOUND vars for the components.
+-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE)
++foreach (_component AVCODEC AVFORMAT SWSCALE)
+   set_component_found(${_component})
+ endforeach ()
+

Build Results
RPM Lint

Refresh

Comments for request 2311 0

Request History

olh created request about 9 years ago

- Use pkgconfig for ffmpeg BuildRequires

olh accepted request about 9 years ago