diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /sidplayer | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'sidplayer')
| -rw-r--r-- | sidplayer/sidplayer-1.5.0/gcc3.patch | 69 | ||||
| -rw-r--r-- | sidplayer/sidplayer-1.5.0/gcc34.patch | 40 | ||||
| -rw-r--r-- | sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch | 20 | ||||
| -rw-r--r-- | sidplayer/sidplayer_1.5.0.bb | 0 |
4 files changed, 0 insertions, 129 deletions
diff --git a/sidplayer/sidplayer-1.5.0/gcc3.patch b/sidplayer/sidplayer-1.5.0/gcc3.patch deleted file mode 100644 index b94e26a18a..0000000000 --- a/sidplayer/sidplayer-1.5.0/gcc3.patch +++ /dev/null @@ -1,69 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- sidplayer/sidplayer.cpp~gcc3 2003-09-26 20:28:51.000000000 +0200 -+++ sidplayer/sidplayer.cpp 2004-02-12 19:24:33.000000000 +0100 -@@ -83,8 +83,8 @@ - //============================================================================================ - - Sidplayer::Sidplayer( int argc, char **argv, QPEApplication *app, -- QWidget *parent, const char *name, WFlags f ) -- : TabbedDialog( parent, name, f ), -+ QWidget *parent, const char *name, WFlags flags ) -+ : TabbedDialog( parent, name, flags ), - application( app ), - selectedSong( 1 ), - totalSongs( 1 ), -@@ -710,7 +710,7 @@ - - //-------------------------------------------------------------------------------------------- - --void Sidplayer::updateListeningMileageLabel( bool forceUpdate = false ) -+void Sidplayer::updateListeningMileageLabel( bool forceUpdate ) - { - static int oldSecondsTotal = 0; - int secondsTotal = myEmuEngine.getSecondsTotal(); ---- sidplayer/sidplayer_file.cpp~gcc3 2003-09-25 21:56:57.000000000 +0200 -+++ sidplayer/sidplayer_file.cpp 2004-02-12 19:24:33.000000000 +0100 -@@ -249,7 +249,7 @@ - } - } - --void Sidplayer::populateFileView( const QString &directory, const QString &selectThis = "" ) -+void Sidplayer::populateFileView( const QString &directory, const QString &selectThis ) - { - QDir dir( directory ); - ---- sidplayer/sidplayer_list.cpp~gcc3 2003-07-09 21:49:28.000000000 +0200 -+++ sidplayer/sidplayer_list.cpp 2004-02-12 19:24:33.000000000 +0100 -@@ -172,7 +172,7 @@ - setAllPlaylistViewItemsOddFlag(); - } - --void Sidplayer::insertDir_( QString dirpath = "" ) -+void Sidplayer::insertDir_( QString dirpath ) - { - if ( dirpath == "" ) - dirpath = currentDir; -@@ -225,7 +225,7 @@ - setAllPlaylistViewItemsOddFlag(); - } - --void Sidplayer::insertDirRecursive_( QString dirpath = "" ) -+void Sidplayer::insertDirRecursive_( QString dirpath ) - { - if ( dirpath == "" ) - dirpath = currentDir; ---- sidplayer/volumebarwidget.cpp~gcc3 2003-07-09 22:35:48.000000000 +0200 -+++ sidplayer/volumebarwidget.cpp 2004-02-12 19:28:54.000000000 +0100 -@@ -18,7 +18,7 @@ - - #include <iostream> - --VolumeBarWidget::VolumeBarWidget( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ) -+VolumeBarWidget::VolumeBarWidget( QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ) - { - getVolume(); diff --git a/sidplayer/sidplayer-1.5.0/gcc34.patch b/sidplayer/sidplayer-1.5.0/gcc34.patch deleted file mode 100644 index 00598a103c..0000000000 --- a/sidplayer/sidplayer-1.5.0/gcc34.patch +++ /dev/null @@ -1,40 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- sidplayer/sidplayer.h~gcc34.patch 2004-05-16 20:54:24.000000000 +0200 -+++ sidplayer/sidplayer.h 2004-05-16 20:54:24.000000000 +0200 -@@ -36,7 +36,7 @@ - - #define SHUTDOWN_TIMER_TIMEOUT 10 // 2 would probably be also long enough - -- -+static bool evenFlag = 0; - extern bool sidEmuFastForwardReplay( int ); - - ---- sidplayer/sidplayer_list.cpp~gcc34.patch 2004-05-16 20:54:24.000000000 +0200 -+++ sidplayer/sidplayer_list.cpp 2004-05-16 20:55:40.000000000 +0200 -@@ -23,9 +23,6 @@ - #include <qpe/config.h> - - --static bool evenFlag; // This global flag is used to toggle between even and odd list entries -- // when generating list items (i.e. when populating a list). -- - PlaylistItem::PlaylistItem( QListView *parent, QListViewItem *after, const QFileInfo &fi, - const QString &name, - const QString &author, ---- sidplayer/sidplayer_file.cpp~gcc34.patch 2004-05-16 20:54:24.000000000 +0200 -+++ sidplayer/sidplayer_file.cpp 2004-05-16 20:56:01.000000000 +0200 -@@ -24,9 +24,6 @@ - #endif - - --static bool evenFlag; // This global flag is used to toggle between even and odd list entries -- // when generating list items (i.e. when populating a list). -- - FileItem::FileItem( QListView *parent, const QFileInfo &fi, int type ) - : ItemBase( parent ), - fileInfo( fi ) diff --git a/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch b/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch deleted file mode 100644 index 7c00079299..0000000000 --- a/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- sidplayer/sidplayer.h~use-external-libsidplay 2003-09-26 00:28:31.000000000 +0200 -+++ sidplayer/sidplayer.h 2004-02-12 18:16:19.000000000 +0100 -@@ -13,9 +13,9 @@ - - #include "tabbeddialog.h" - --#include "libsidplay/src/player.h" --#include "libsidplay/src/fformat.h" --#include "libsidplay/src/myendian.h" -+#include <player.h> -+#include <fformat.h> -+#include <myendian.h> - #include "audiodrv.h" - - #include <qpe/qpeapplication.h> diff --git a/sidplayer/sidplayer_1.5.0.bb b/sidplayer/sidplayer_1.5.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/sidplayer/sidplayer_1.5.0.bb +++ /dev/null |
