From ef8b9e20926267113b23718f3a0796379de04077 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Wed, 26 Dec 2018 21:17:45 -0800 Subject: [PATCH] Fedora fixes for ffmpeg. --- CMakeLists.txt | 2 ++ musikcube.spec | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9a323814..62adb1645 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,8 @@ else() add_definitions(-DFFMPEG_DECODER) add_subdirectory(src/plugins/ffmpegdecoder) add_dependencies(musikcube ffmpegdecoder) + include_directories("/usr/include/ffmpeg") + include_directories("/usr/local/include/ffmpeg") endif() # some versions of Ubuntu ship with a taglib binary that is missing some diff --git a/musikcube.spec b/musikcube.spec index cdf9066b4..50fb3e5a9 100644 --- a/musikcube.spec +++ b/musikcube.spec @@ -8,9 +8,8 @@ Summary: A cross-platform, terminal-based audio engine, library, player and serv Source0: https://github.com/clangen/musikcube/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz License: BSD-3-Clause Packager: David Muckle -BuildRequires: gcc-c++ cmake boost-devel libogg-devel libvorbis-devel flac-devel faad2-devel ncurses-devel zlib-devel alsa-lib-devel pulseaudio-libs-devel openssl-devel libcurl-devel libmicrohttpd-devel lame-devel libev-devel taglib-devel make -Requires: boost libogg libvorbis flac ncurses zlib alsa-lib pulseaudio-libs openssl libcurl libmicrohttpd lame libev taglib -Recommends: faad2 +BuildRequires: gcc-c++ cmake boost-devel libogg-devel libvorbis-devel ffmpeg-devel ncurses-devel zlib-devel alsa-lib-devel pulseaudio-libs-devel openssl-devel libcurl-devel libmicrohttpd-devel lame-devel libev-devel taglib-devel make +Requires: boost libogg libvorbis ffmpeg-libs ncurses zlib alsa-lib pulseaudio-libs openssl libcurl libmicrohttpd lame libev taglib %description