summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/sonic-visualiser/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/sonic-visualiser/files')
-rw-r--r--media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch37
-rw-r--r--media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch11
-rw-r--r--media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch10
-rw-r--r--media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch20
4 files changed, 78 insertions, 0 deletions
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
new file mode 100644
index 000000000000..6f2842c35132
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
@@ -0,0 +1,37 @@
+Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
+===================================================================
+--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.cpp
++++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
+@@ -138,15 +138,15 @@ OggVorbisFileReader::DecodeThread::run()
+ }
+
+ int
+-OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
++OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
+ {
+ OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
+ FishSound *fs = reader->m_fishSound;
+
+- fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
+- fish_sound_decode(fs, packet->packet, packet->bytes);
++ fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s);
++ fish_sound_decode(fs, packet->op.packet, packet->op.bytes);
+
+- reader->m_bytesRead += packet->bytes;
++ reader->m_bytesRead += packet->op.bytes;
+
+ // The number of bytes read by this function is smaller than
+ // the file size because of the packet headers
+Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
+===================================================================
+--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.h
++++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
+@@ -82,7 +82,7 @@ protected:
+ bool m_cancelled;
+ int m_completion;
+
+- static int readPacket(OGGZ *, ogg_packet *, long, void *);
++ static int readPacket(OGGZ *, oggz_packet *, long, void *);
+ static int acceptFrames(FishSound *, float **, long, void *);
+
+ class DecodeThread : public Thread
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
new file mode 100644
index 000000000000..02752b746acc
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
@@ -0,0 +1,11 @@
+--- sonic-visualiser-1.8/configure.orig
++++ sonic-visualiser-1.8/configure
+@@ -18,7 +18,7 @@
+ \$(MAKE) --directory=svgui
+ sub-svapp:
+ \$(MAKE) --directory=svapp
+-sub-sonic-visualiser:
++sub-sonic-visualiser: sub-svcore sub-svgui sub-svapp
+ \$(MAKE) --directory=sonic-visualiser
+ EOF
+ echo " *** Generated Makefile"
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
new file mode 100644
index 000000000000..47ff291daa97
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
@@ -0,0 +1,10 @@
+--- sonic-visualiser-1.8/svcore/base/ResizeableBitset.h.orig
++++ sonic-visualiser-1.8/svcore/base/ResizeableBitset.h
+@@ -16,6 +16,7 @@
+ #ifndef _RESIZEABLE_BITMAP_H_
+ #define _RESIZEABLE_BITMAP_H_
+
++#include <cstddef>
+ #include <vector>
+ #include <stdint.h>
+
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
new file mode 100644
index 000000000000..19f9fb488f01
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
@@ -0,0 +1,20 @@
+--- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
++++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
+@@ -22,6 +22,7 @@
+ #include "base/Serialiser.h"
+ #include "base/Resampler.h"
+
++#include <stdint.h>
+ #include <iostream>
+ #include <QDir>
+ #include <QMutexLocker>
+--- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
++++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
+@@ -26,6 +26,7 @@
+
+ #include <cassert>
+ #include <iostream>
++#include <stdint.h>
+
+ //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
+