Request 2321 (accepted)

Overview

Request 2321 (accepted)

- Use pkgconfig for ffmpeg BuildRequires

Created by olh over 8 years ago
In state accepted

Submit performous

Submit package home:olh:pkgconfig-ffmpeg / performous to package Games / performous

performous.changes Changed

performous.spec Changed

@@ -25,7 +25,8 @@
 Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/performous-%{version}.tar.bz2
 Source1:        http://downloads.sourceforge.net/project/performous/ultrastar-songs-libre/3/ultrastar-songs-libre-3.zip
 Source2:        README_SONG
-#Patch:
+Patch0:         performous-ffmpeg.patch
+Patch1:         performous-0.7.0.patch
 BuildRequires:  boost-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
@@ -33,9 +34,6 @@
 BuildRequires:  glew-devel
 BuildRequires:  glibmm2-devel
 BuildRequires:  help2man
-BuildRequires:  libMagick++-devel
-BuildRequires:  libSDL-devel
-BuildRequires:  libffmpeg-devel
 %if 0%{?suse_version} <= 1130
 BuildRequires:  libjpeg-devel
 %else
@@ -46,8 +44,16 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml++-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  opencv-devel
-BuildRequires:  pango-devel
+BuildRequires:  pkgconfig(ImageMagick)
+BuildRequires:  pkgconfig(ImageMagick++)
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(opencv)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pangocairo)
+BuildRequires:  pkgconfig(sdl)
 BuildRequires:  portaudio-devel
 BuildRequires:  portmidi-devel
 BuildRequires:  unzip
@@ -61,8 +67,9 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 cp %{S:2} .
-rm -f cmake/Modules/FindOpenCV.cmake
 
 %build
 # set optflags

performous-0.7.0.patch Added

@@ -0,0 +1,90 @@
+---
+ cmake/Modules/FindCairo.cmake    |    5 ++---
+ cmake/Modules/FindMagick++.cmake |    6 +++---
+ cmake/Modules/FindOpenCV.cmake   |    8 +-------
+ cmake/Modules/FindPango.cmake    |    7 +++----
+ 4 files changed, 9 insertions(+), 17 deletions(-)
+
+--- performous-0.7.0.orig/cmake/Modules/FindCairo.cmake
++++ performous-0.7.0/cmake/Modules/FindCairo.cmake
+@@ -8,7 +8,6 @@
+ include(LibFindMacros)
+ 
+ # Dependencies
+-libfind_package(Cairo Freetype)
+ 
+ # Use pkg-config to get hints about paths
+ libfind_pkg_check_modules(Cairo_PKGCONF cairo)
+@@ -28,7 +27,7 @@ find_library(Cairo_LIBRARY
+ 
+ # Set the include dir variables and the libraries and let libfind_process do the rest.
+ # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+-set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR Freetype_INCLUDE_DIRS)
+-set(Cairo_PROCESS_LIBS Cairo_LIBRARY Freetype_LIBRARIES)
++set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR)
++set(Cairo_PROCESS_LIBS Cairo_LIBRARY)
+ libfind_process(Cairo)
+ 
+--- performous-0.7.0.orig/cmake/Modules/FindMagick++.cmake
++++ performous-0.7.0/cmake/Modules/FindMagick++.cmake
+@@ -21,13 +21,13 @@ find_path(Magick++_INCLUDE_DIR
+ 
+ # Finally the library itself
+ find_library(Magick++_LIBRARY
+-  NAMES Magick++ CORE_RL_magick++_
++  NAMES ${Magick++_PKGCONF_LIBRARIES}
+   PATHS ${Magick++_PKGCONF_LIBRARY_DIRS}
+ )
+ 
+ # Set the include dir variables and the libraries and let libfind_process do the rest.
+ # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+-set(Magick++_PROCESS_INCLUDES Magick++_INCLUDE_DIR Magick_INCLUDE_DIRS)
+-set(Magick++_PROCESS_LIBS Magick++_LIBRARY Magick_LIBRARIES)
++set(Magick++_PROCESS_INCLUDES Magick++_INCLUDE_DIR)
++set(Magick++_PROCESS_LIBS Magick++_LIBRARY)
+ libfind_process(Magick++)
+ 
+--- performous-0.7.0.orig/cmake/Modules/FindOpenCV.cmake
++++ performous-0.7.0/cmake/Modules/FindOpenCV.cmake
+@@ -114,13 +114,7 @@ if(EXISTS "${OpenCV_DIR}")
+ 
+       endif(NOT EXISTS ${VERSION_FILE_DIR})
+ 
+-      #file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
+-      file(STRINGS ${VERSION_FILE} OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
+-
+-      string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP})
+-      string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP})
+-      string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP})
+-      set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE)
++      set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION})
+ 
+       if(WIN32 OR NOT PKG_CONFIG_FOUND)
+ 	set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+--- performous-0.7.0.orig/cmake/Modules/FindPango.cmake
++++ performous-0.7.0/cmake/Modules/FindPango.cmake
+@@ -8,7 +8,6 @@
+ include(LibFindMacros)
+ 
+ # Dependencies
+-libfind_package(Pango Freetype)
+ libfind_package(Pango Glib)
+ libfind_package(Pango GObject)
+ 
+@@ -24,13 +23,13 @@ find_path(Pango_INCLUDE_DIR
+ 
+ # Finally the library itself
+ find_library(Pango_LIBRARY
+-  NAMES pango-1.0
++  NAMES ${Pango_PKGCONF_LIBRARIES}
+   PATHS ${Pango_PKGCONF_LIBRARY_DIRS}
+ )
+ 
+ # Set the include dir variables and the libraries and let libfind_process do the rest.
+ # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+-set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR Freetype_INCLUDE_DIRS Glib_INCLUDE_DIRS)
+-set(Pango_PROCESS_LIBS Pango_LIBRARY Freetype_LIBRARIES Glib_LIBRARIES GObject_LIBRARIES)
++set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR Glib_INCLUDE_DIRS)
++set(Pango_PROCESS_LIBS Pango_LIBRARY Glib_LIBRARIES GObject_LIBRARIES)
+ libfind_process(Pango)
+

performous-ffmpeg.patch Added

Build Results
RPM Lint

Refresh

Comments for request 2321 0

Request History

olh created request over 8 years ago

- Use pkgconfig for ffmpeg BuildRequires

olh accepted request over 8 years ago