Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4a70cd9dfb4407b19ecfee2d82f14a802f11ce0
commit a4a70cd9dfb4407b19ecfee2d82f14a802f11ce0 Author: James Buren <[email protected]> Date: Wed Nov 18 05:51:49 2015 +0100 performous-1.0-5-x86_64 * remove package diff --git a/source/games-extra/performous/FrugalBuild b/source/games-extra/performous/FrugalBuild deleted file mode 100644 index 94a6282..0000000 --- a/source/games-extra/performous/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 1.35 SBU -# Maintainer: DeX77 <[email protected]> -# Contributor: kikadf <[email protected]> -# Contributor: Priyank Gosalia <[email protected]> -# Contributor: DeX77 <[email protected]> - -optoins+=('asneeded') - -pkgname=performous -pkgver=1.0 -pkgrel=5 -url="http://performous.org/"; -pkgdesc="Performous : The free Linux karaoke game" -rodepends=('performous-songs') -depends=('fftw' 'smpeg' 'librsvg' 'xine-lib>=1.2.6-2' 'sdl_gfx>=2.0.19' 'libsigc++2' \ - 'libgcc' 'sdl2' 'gstreamer' 'alsa-lib' 'libboost>=1.58.0' 'glibmm' \ - 'libxml++' 'jack' 'glew>=1.13' 'portaudio' 'opencv>=2.4.10-2' 'ffmpeg>=2.5.4' \ - 'portmidi') -makedepends=('boost>=1.58.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 boost15.patch) -sha1sums=('36d3e21eaea1da0fac49a9fa934d3eb164eb9e2f' \ - '362ded998a3c3ad22d8c1ffae972ec4edcec1d6f') - - -# optimization OK diff --git a/source/games-extra/performous/boost15.patch b/source/games-extra/performous/boost15.patch deleted file mode 100644 index 811e166..0000000 --- a/source/games-extra/performous/boost15.patch +++ /dev/null @@ -1,62 +0,0 @@ -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; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
