Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=13029d6284be335a6764ab70e87f264be2789d54
commit 13029d6284be335a6764ab70e87f264be2789d54 Author: kikadf <[email protected]> Date: Sun Jan 4 19:21:15 2015 +0100 performous-1.0-1-x86_64 * Version bump * Build with ffmpeg-2.5.2 diff --git a/source/games-extra/performous/FrugalBuild b/source/games-extra/performous/FrugalBuild index 8a6ed3f..3a2ba51 100644 --- a/source/games-extra/performous/FrugalBuild +++ b/source/games-extra/performous/FrugalBuild @@ -6,22 +6,25 @@ optoins+=('asneeded') pkgname=performous -pkgver=0.7.0 -pkgrel=3 +pkgver=1.0 +pkgrel=1 url="http://performous.org/" pkgdesc="Performous : The free Linux karaoke game" rodepends=('performous-songs') -depends=('fftw' 'smpeg' 'librsvg' 'xine-lib' 'sdl_gfx>=2.0.19' 'libsigc++2' \ - 'sdlimage' 'libgcc' 'sdl' 'gstreamer' 'alsa-lib' 'libboost>=1.50.0' 'glibmm' \ - 'libxml++' 'jack' 'glew>=1.10.0' 'portaudio' 'opencv' 'ffmpeg>=1.0') -makedepends=('boost>=1.50.0') -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge cmake +depends=('fftw' 'smpeg' 'librsvg' 'xine-lib>=1.2.6-2' 'sdl_gfx>=2.0.19' 'libsigc++2' \ + 'libgcc' 'sdl2' 'gstreamer' 'alsa-lib' 'libboost>=1.50.0' 'glibmm' \ + 'libxml++' 'jack' 'glew>=1.10.0' 'portaudio' 'opencv>=2.4.10-2' 'ffmpeg>=2.5.2-2' \ + 'portmidi') +makedepends=('boost>=1.50.0' 'help2man') +_F_github_tag="Y" +Finclude github cmake +_F_cmake_confopts=" -DMagick++_LIBRARY=/usr/lib/libMagick++-6.Q16.so \ + -DMagick_LIBRARY=/usr/lib/libMagickCore-6.Q16.so" groups=('games-extra') archs=('i686' 'x86_64') -source=($source performous-0.7.0-cmake.patch) -sha1sums=('6e350b407fac13b0f1d94d69f1924d0513df3a05' \ - '3135d8c37313d93651a78a90d93d2eeb7d60b381') +source=($source boost15.patch) +sha1sums=('36d3e21eaea1da0fac49a9fa934d3eb164eb9e2f' \ + '362ded998a3c3ad22d8c1ffae972ec4edcec1d6f') # optimization OK diff --git a/source/games-extra/performous/boost15.patch b/source/games-extra/performous/boost15.patch new file mode 100644 index 0000000..811e166 --- /dev/null +++ b/source/games-extra/performous/boost15.patch @@ -0,0 +1,62 @@ +diff -Naur performous-1.0/game/ffmpeg.cc performous-1.0.new/game/ffmpeg.cc +--- performous-1.0/game/ffmpeg.cc 2014-10-29 00:11:45.000000000 +0100 ++++ performous-1.0.new/game/ffmpeg.cc 2015-01-04 18:53:13.473929387 +0100 +@@ -196,9 +196,9 @@ + packetSize -= decodeSize; // Move forward within the packet + if (!frameFinished) continue; + // Update current position if timecode is available +- if (frame->pkt_pts != int64_t(AV_NOPTS_VALUE)) { ++ if (frame->pkt_pts != boost::int64_t(AV_NOPTS_VALUE)) { + m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base); +- if (m_formatContext->start_time != int64_t(AV_NOPTS_VALUE)) ++ if (m_formatContext->start_time != boost::int64_t(AV_NOPTS_VALUE)) + m_position -= double(m_formatContext->start_time) / AV_TIME_BASE; + } + if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame.get()); else processAudio(frame.get()); +diff -Naur performous-1.0/game/ffmpeg.hh performous-1.0.new/game/ffmpeg.hh +--- performous-1.0/game/ffmpeg.hh 2014-10-29 00:11:45.000000000 +0100 ++++ performous-1.0.new/game/ffmpeg.hh 2015-01-04 18:52:19.061305668 +0100 +@@ -15,7 +15,6 @@ + + using boost::uint8_t; + using boost::int16_t; +-using boost::int64_t; + + /// single audio frame + struct AudioFrame { +@@ -109,7 +108,7 @@ + m_data.insert(m_data.end(), data.begin(), data.end()); + m_pos += data.size(); + } +- bool prepare(int64_t pos) { ++ bool prepare(boost::int64_t pos) { + mutex::scoped_try_lock l(m_mutex); + if (!l.owns_lock()) return false; // Didn't get lock, give up for now + if (eof(pos)) return true; +@@ -119,7 +118,7 @@ + // Has enough been prebuffered already and is the requested position still within buffer + return m_pos > m_posReq + m_data.capacity() / 16 && m_pos <= m_posReq + m_data.size(); + } +- bool operator()(float* begin, float* end, int64_t pos, float volume = 1.0f) { ++ bool operator()(float* begin, float* end, boost::int64_t pos, float volume = 1.0f) { + mutex::scoped_lock l(m_mutex); + size_t idx = pos + m_data.size() - m_pos; + size_t samples = end - begin; +@@ -130,7 +129,7 @@ + wakeups(); + return !eof(pos); + } +- bool eof(int64_t pos) const { return double(pos) / m_sps >= m_duration; } ++ bool eof(boost::int64_t pos) const { return double(pos) / m_sps >= m_duration; } + void setEof() { m_duration = double(m_pos) / m_sps; } + double duration() const { return m_duration; } + void setDuration(double seconds) { m_duration = seconds; } +@@ -151,7 +150,7 @@ + boost::condition m_cond; + boost::circular_buffer<int16_t> m_data; + size_t m_pos; +- int64_t m_posReq; ++ boost::int64_t m_posReq; + unsigned m_sps; + double m_duration; + bool m_quit; diff --git a/source/games-extra/performous/performous-0.7.0-cmake.patch b/source/games-extra/performous/performous-0.7.0-cmake.patch deleted file mode 100644 index 59dc0bf..0000000 --- a/source/games-extra/performous/performous-0.7.0-cmake.patch +++ /dev/null @@ -1,155 +0,0 @@ -From: Julian Ospald <[email protected]> -Date: Thu Jan 24 13:13:50 UTC 2013 -Subject: build system - - - fix opencv module to prefer pkg-config results - - fix some module and macro names and try to use - system modules as much as possible (ALSA Boost Gettext Jpeg Png Tiff Z) - ---- cmake/Modules/FindOpenCV.cmake -+++ cmake/Modules/FindOpenCV.cmake -@@ -57,13 +57,21 @@ - include(FindPkgConfig) - if(PKG_CONFIG_FOUND) - pkg_check_modules(OPENCV_PKGCONF opencv) -- set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX}) -- if(EXISTS "${OpenCV_DIR}") -- set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv") -- if(EXISTS "${OpenCV_configScript_DIR}") -- set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake") -- endif(EXISTS "${OpenCV_configScript_DIR}") -- endif(EXISTS "${OpenCV_DIR}") -+ # prefer pkg-config values -+ if(OPENCV_PKGCONF_FOUND) -+ set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS}) -+ set(OpenCV_FOUND true) -+ set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS}) -+ set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION}) -+ else(OPENCV_PKGCONF_FOUND) -+ set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX}) -+ if(EXISTS "${OpenCV_DIR}") -+ set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv") -+ if(EXISTS "${OpenCV_configScript_DIR}") -+ set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake") -+ endif(EXISTS "${OpenCV_configScript_DIR}") -+ endif(EXISTS "${OpenCV_DIR}") -+ endif(OPENCV_PKGCONF_FOUND) - endif(PKG_CONFIG_FOUND) - endif(NOT WIN32) - endif(NOT EXISTS "${OpenCV_DIR}") -@@ -72,7 +80,7 @@ - ##==================================================== - ## Find OpenCV libraries - ##---------------------------------------------------- --if(EXISTS "${OpenCV_DIR}") -+if(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) - - #When its possible to use the Config script use it. - if(EXISTS "${OpenCV_configScript}") -@@ -257,9 +265,9 @@ - endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0) - - --else(EXISTS "${OpenCV_DIR}") -+else(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) - set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") --endif(EXISTS "${OpenCV_DIR}") -+endif(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) - ##==================================================== - - ##==================================================== ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -33,7 +33,7 @@ - - #need to put here do setting LOCALE_DIR variable - find_package(Gettext) --if(Gettext_FOUND) -+if(GETTEXT_FOUND) - if(NOT LOCALE_DIR) - if(WIN32) - SET(LOCALE_DIR "bin/locale") -@@ -55,7 +55,7 @@ - message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled") - endif() - endif(NOT LOCALE_DIR) --endif(Gettext_FOUND) -+endif(GETTEXT_FOUND) - add_subdirectory(themes) - add_subdirectory(data) - add_subdirectory(game) ---- game/CMakeLists.txt -+++ game/CMakeLists.txt -@@ -71,7 +71,7 @@ - list(APPEND LIBS ${Boost_LIBRARIES}) - - # Find all the libs that don't require extra parameters --foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Png PortAudio) -+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL ZLIB JPEG PNG PortAudio) - find_package(${lib} REQUIRED) - include_directories(${${lib}_INCLUDE_DIRS}) - list(APPEND LIBS ${${lib}_LIBRARIES}) -@@ -79,7 +79,7 @@ - endforeach(lib) - - find_package(Gettext) --if(Gettext_FOUND) -+if(GETTEXT_FOUND) - include_directories(${Gettext_INCLUDE_DIRS}) - list(APPEND LIBS ${Gettext_LIBRARIES}) - add_definitions("-DUSE_GETTEXT") ---- tools/CMakeLists.txt -+++ tools/CMakeLists.txt -@@ -6,7 +6,7 @@ - include_directories(${Boost_INCLUDE_DIRS}) - - # Find all the libs that don't require extra parameters --foreach(lib LibXML++ Magick++ Z Jpeg Tiff Png Freetype Z) -+foreach(lib LibXML++ Magick++ ZLIB JPEG TIFF PNG Freetype ZLIB) - find_package(${lib}) - if (${lib}_FOUND) - include_directories(${${lib}_INCLUDE_DIRS}) -@@ -24,13 +24,13 @@ - if (LibXML++_FOUND) - if (Boost_FOUND) - if (Magick++_FOUND) -- if (Z_FOUND) -+ if (ZLIB_FOUND) - add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp) -- target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) -+ target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) - set(targets ${targets} ss_extract) -- else (Z_FOUND) -+ else (ZLIB_FOUND) - message("No zlib found, not building ss_extract") -- endif (Z_FOUND) -+ endif (ZLIB_FOUND) - else (Magick++_FOUND) - message("No Magick++ found, not building ss_extract") - endif (Magick++_FOUND) -@@ -40,7 +40,7 @@ - - if (Magick++_FOUND) - add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp) -- target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) -+ target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) - set(targets ${targets} ss_cover_conv) - else (Magick++_FOUND) - message("No Magick++ found, not building ss_cover_conv") -@@ -58,13 +58,13 @@ - target_link_libraries(ss_archive_extract ${Boost_LIBRARIES}) - set(targets ${targets} ss_archive_extract) - -- if (Z_FOUND) -+ if (ZLIB_FOUND) - add_executable(itg_pck itg_pck.cc) -- target_link_libraries(itg_pck ${Boost_LIBRARIES} ${Z_LIBRARIES}) -+ target_link_libraries(itg_pck ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) - set(targets ${targets} itg_pck) - - add_executable(ss_chc_decode ss_chc_decode.cpp) -- target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${Z_LIBRARIES}) -+ target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) - set(targets ${targets} ss_chc_decode) - endif() - endif (Boost_FOUND) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
