Projects
Essentials
lightspark
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 120
View file
lightspark.spec
Changed
@@ -27,6 +27,7 @@ Group: Productivity/Multimedia/Other Url: https://launchpad.net/lightspark/ Source0: lightspark.tar.xz +Source1: 0001-FFMPEG_INCLUDE_DIRS-must-be-a-list-not-a-string.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -85,12 +86,13 @@ %prep %setup -q -n %{name} +patch --merge -p1 < %{S:1} %build -export CFLAGS='%{optflags}' -export CXXFLAGS='%{optflags}' mkdir build cd build +CFLAGS='%{optflags}' \ +CXXFLAGS='%{optflags}' \ cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
View file
0001-FFMPEG_INCLUDE_DIRS-must-be-a-list-not-a-string.patch
Added
@@ -0,0 +1,31 @@ +From a62159e74fae5eda9dc5dfd3a8fb4229bf10eeab Mon Sep 17 00:00:00 2001 +From: Johannes Obermayr <johannesobermayr@gmx.de> +Date: Thu, 20 Oct 2016 20:02:00 +0200 +Subject: [PATCH] FFMPEG_INCLUDE_DIRS must be a list not a string. + +Changes CXX_INCLUDES: +- ... -I"/usr/include/ffmpeg /usr/include/ffmpeg" ... ++ ... -I/usr/include/ffmpeg ... + +Fixes: +src/backends/decoder.h:29:32: fatal error: libavcodec/avcodec.h: No such file or directory +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92f8560..9c0feb1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -296,7 +296,7 @@ IF(ENABLE_LIBAVCODEC) + INCLUDE(CheckFunctionExists REQUIRED) + INCLUDE(CheckCSourceCompiles) + SET(FFMPEG_FLAGS "${LIBAVCODEC_CFLAGS} ${LIBAVRESAMPLE_FLAGS}") +- SET(FFMPEG_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS}") ++ SET(FFMPEG_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS};${LIBAVRESAMPLE_INCLUDE_DIRS}") + SET(FFMPEG_LIBRARIES "${FFMPEG_LIBRARIES};${LIBAVRESAMPLE_LIBRARIES}") + SET(CMAKE_REQUIRED_FLAGS ${FFMPEG_FLAGS}) + SET(CMAKE_REQUIRED_INCLUDES ${FFMPEG_INCLUDE_DIRS}) +-- +2.10.1 +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.