I have made the following changes intended for : CE:Apps / emumaster Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7159 Thank You, wonko [This message was auto-generated] --- Request # 7159: Messages from BOSS: State: review at 2012-10-28T16:22:03 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:wonko / emumaster -> CE:Apps / emumaster changes files: -------------- ++++++ new changes file: --- emumaster.changes +++ emumaster.changes @@ -0,0 +1,3 @@ +* Sun Oct 28 2012 Ruediger Gad <[email protected]> - 0.3.0 +- First try on getting a release for Nemo done. + new: ---- emumaster.changes emumaster.spec emumaster.yaml emumaster_0.3.0.tar.gz fix_compile_and_linking.patch fix_home_dir_path.patch fix_linux-gpp-maemo_scope.patch remove-six-axis-controller.patch remove_obsolete_check_in_diskgallery.patch spec files: ----------- ++++++ new spec file: --- emumaster.spec +++ emumaster.spec @@ -0,0 +1,98 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.25 +# + +Name: emumaster + +# >> macros +# << macros + +Summary: An emulator for different gaming consoles etc. +Version: 0.3.0 +Release: 1 +Group: Amusements/Games +License: GPLv2 +URL: https://bitbucket.org/elemental/emumaster/wiki/Home +Source0: %{name}_%{version}.tar.gz +Source100: emumaster.yaml +Patch0: remove-six-axis-controller.patch +Patch1: remove_obsolete_check_in_diskgallery.patch +Patch2: fix_compile_and_linking.patch +Patch3: fix_linux-gpp-maemo_scope.patch +Patch4: fix_home_dir_path.patch +Requires: libqtfeedback1 +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(QtCore) >= 4.7.0 +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(qdeclarative-boostable) +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(QtFeedback) +BuildRequires: pkgconfig(QtSensors) +BuildRequires: pkgconfig(QtSystemInfo) +BuildRequires: pkgconfig(QtNetwork) +BuildRequires: pkgconfig(qmsystem2) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: desktop-file-utils + +%description +EmuMaster emulates popular consoles. It is written in Qt/QML. Item at Nokia Store store.ovi.com/content/207988 Donate version store.ovi.com/content/268920 + + +%prep +%setup -q -n %{name} + +# remove-six-axis-controller.patch +%patch0 -p1 +# remove_obsolete_check_in_diskgallery.patch +%patch1 -p1 +# fix_compile_and_linking.patch +%patch2 -p1 +# fix_linux-gpp-maemo_scope.patch +%patch3 -p1 +# fix_home_dir_path.patch +%patch4 -p1 +# >> setup +# << setup + +%build +# >> build pre +cd src +qmake emumaster.pro +make +# << build pre + + + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +cd src +make install INSTALL_ROOT=%{buildroot} +# << install pre + +# >> install post +# << install post + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_datadir}/applications/diskgallery.desktop +%{_datadir}/policy/etc/syspart.conf.d/* +/opt/%{name} +/opt/emumaster/lib/libbase.so.1.0.0 +# >> files +# << files other changes: -------------- ++++++ emumaster.yaml (new) --- emumaster.yaml +++ emumaster.yaml @@ -0,0 +1,43 @@ +Name: emumaster +Summary: An emulator for different gaming consoles etc. +Version: 0.3.0 +Release: 1 +Group: Amusements/Games +License: GPLv2 +URL: https://bitbucket.org/elemental/emumaster/wiki/Home +Sources: + - "%{name}_%{version}.tar.gz" +Patches: + - remove-six-axis-controller.patch + - remove_obsolete_check_in_diskgallery.patch + - fix_compile_and_linking.patch + - fix_linux-gpp-maemo_scope.patch + - fix_home_dir_path.patch +Description: + EmuMaster emulates popular consoles. + It is written in Qt/QML. + Item at Nokia Store store.ovi.com/content/207988 + Donate version store.ovi.com/content/268920 + +PkgConfigBR: + - QtCore >= 4.7.0 + - QtGui + - qdeclarative-boostable + - QtOpenGL + - QtFeedback + - QtSensors + - QtSystemInfo + - QtNetwork + - qmsystem2 + - libxml-2.0 + - libpulse + - gstreamer-0.10 +Requires: + - libqtfeedback1 +Configure: none +Builder: none +Files: + - "%{_datadir}/applications/diskgallery.desktop" + - "%{_datadir}/policy/etc/syspart.conf.d/*" + - "/opt/%{name}" + - "/opt/emumaster/lib/libbase.so.1.0.0" ++++++ emumaster_0.3.0.tar.gz (new) ++++++ fix_compile_and_linking.patch (new) --- fix_compile_and_linking.patch +++ fix_compile_and_linking.patch @@ -0,0 +1,62 @@ +diff --git a/src/base/base.pro b/src/base/base.pro +index bc47c5d..ca20646 100644 +--- a/src/base/base.pro ++++ b/src/base/base.pro +@@ -2,10 +2,13 @@ TEMPLATE = lib + DESTDIR = ../../lib + INCLUDEPATH += .. + QT += declarative opengl network +-LIBS += -L../../lib -lpulse ++LIBS += -L../../lib -lpulse -lQtFeedback + CONFIG += mobility + MOBILITY += sensors feedback + ++QMAKE_CFLAGS_RELEASE += -mfpu=neon ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon ++ + linux-g++-maemo { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 +diff --git a/src/emu.pri b/src/emu.pri +index d5044fd..6965ae5 100644 +--- a/src/emu.pri ++++ b/src/emu.pri +@@ -3,6 +3,9 @@ LIBS += -L../../lib -lbase + INCLUDEPATH += .. + QT += opengl declarative + ++QMAKE_CFLAGS_RELEASE += -mfpu=neon ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon ++ + #contains(CONFIG,release) { + # QMAKE_CFLAGS_RELEASE -= -O2 + # QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -O2 +diff --git a/src/nes/nes.pro b/src/nes/nes.pro +index e842d70..d1bfcaf 100644 +--- a/src/nes/nes.pro ++++ b/src/nes/nes.pro +@@ -10,6 +10,9 @@ contains(DEFINES,ENABLE_DEBUGGING) { + QT += network + } + ++QMAKE_CFLAGS_RELEASE += -mfpu=neon ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon ++ + HEADERS += \ + apu.h \ + apuchannel.h \ +diff --git a/src/psx/psx.pro b/src/psx/psx.pro +index 73e22a8..a5a8339 100644 +--- a/src/psx/psx.pro ++++ b/src/psx/psx.pro +@@ -1,5 +1,10 @@ + include(../emu.pri) + ++QMAKE_CFLAGS_RELEASE += -mfpu=neon ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon ++ ++LIBS += -lz ++ + HEADERS += \ + ppf.h \ + misc.h \ ++++++ fix_home_dir_path.patch (new) --- fix_home_dir_path.patch +++ fix_home_dir_path.patch @@ -0,0 +1,34 @@ +diff --git a/qml/gallery/CoverSelectorPage.qml b/qml/gallery/CoverSelectorPage.qml +index db06dc3..ed4e254 100644 +--- a/qml/gallery/CoverSelectorPage.qml ++++ b/qml/gallery/CoverSelectorPage.qml +@@ -43,7 +43,7 @@ Page { + + FolderListModel { + id: folderModel +- folder: "file:/home/user/MyDocs/emumaster/covers" ++ folder: "file:/home/nemo/emumaster/covers" + nameFilters: ["*.jpg"] + showDirs: false + } +diff --git a/src/base/pathmanager.cpp b/src/base/pathmanager.cpp +index 5639cdb..e76489e 100644 +--- a/src/base/pathmanager.cpp ++++ b/src/base/pathmanager.cpp +@@ -36,7 +36,7 @@ PathManager::PathManager() + + m_installationDirPath = "/opt/emumaster"; + m_userDataDirPath = QString("%1/.emumaster").arg(getenv("HOME")); +- m_diskDirBase = QString("%1/MyDocs/emumaster").arg(getenv("HOME")); ++ m_diskDirBase = QString("%1/emumaster").arg(getenv("HOME")); + } + + /*! Creates subdirs for every emulation in the given \a dir. */ +@@ -60,7 +60,6 @@ void PathManager::buildLocalDirTree() + dir.cd("screenshot"); createEmusSubtree(dir); dir.cdUp(); + + dir = QDir(getenv("HOME")); +- dir.cd("MyDocs"); + dir.mkdir("emumaster"); + dir.cd("emumaster"); + dir.mkdir("covers"); ++++++ fix_linux-gpp-maemo_scope.patch (new) --- fix_linux-gpp-maemo_scope.patch +++ fix_linux-gpp-maemo_scope.patch @@ -0,0 +1,39 @@ +diff --git a/src/base/base.pro b/src/base/base.pro +index ca20646..78e4a25 100644 +--- a/src/base/base.pro ++++ b/src/base/base.pro +@@ -9,7 +9,7 @@ MOBILITY += sensors feedback + QMAKE_CFLAGS_RELEASE += -mfpu=neon + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon + +-linux-g++-maemo { ++unix { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 + MEEGO_VERSION_PATCH = 0 +diff --git a/src/diskgallery/diskgallery.pro b/src/diskgallery/diskgallery.pro +index e63a0a4..4c2e7f0 100644 +--- a/src/diskgallery/diskgallery.pro ++++ b/src/diskgallery/diskgallery.pro +@@ -21,7 +21,7 @@ HEADERS += \ + disklistmodel.h \ + touchinputview.h + +-linux-g++-maemo { ++unix { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 + MEEGO_VERSION_PATCH = 0 +diff --git a/src/emu.pri b/src/emu.pri +index b93260e..6f6d9b9 100644 +--- a/src/emu.pri ++++ b/src/emu.pri +@@ -22,7 +22,7 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon + # -falign-functions=32 + #} + +-linux-g++-maemo { ++unix { + MEEGO_VERSION_MAJOR = 1 + MEEGO_VERSION_MINOR = 2 + MEEGO_VERSION_PATCH = 0 ++++++ remove-six-axis-controller.patch (new) --- remove-six-axis-controller.patch +++ remove-six-axis-controller.patch @@ -0,0 +1,140 @@ +diff --git a/src/base/base.pro b/src/base/base.pro +index 6479a72..bc47c5d 100644 +--- a/src/base/base.pro ++++ b/src/base/base.pro +@@ -2,7 +2,7 @@ TEMPLATE = lib + DESTDIR = ../../lib + INCLUDEPATH += .. + QT += declarative opengl network +-LIBS += -L../../lib -lpulse -lsixaxisclient ++LIBS += -L../../lib -lpulse + CONFIG += mobility + MOBILITY += sensors feedback + +@@ -34,7 +34,6 @@ HEADERS += \ + hostinputdevice.h \ + accelinputdevice.h \ + touchinputdevice.h \ +- sixaxisinputdevice.h \ + keybinputdevice.h \ + crc32.h \ + emuview.h \ +@@ -56,7 +55,6 @@ SOURCES += \ + hostinputdevice.cpp \ + accelinputdevice.cpp \ + touchinputdevice.cpp \ +- sixaxisinputdevice.cpp \ + keybinputdevice.cpp \ + crc32.cpp \ + emuview.cpp \ +diff --git a/src/base/hostinput.cpp b/src/base/hostinput.cpp +index 05636ee..85cf5f3 100644 +--- a/src/base/hostinput.cpp ++++ b/src/base/hostinput.cpp +@@ -20,9 +20,7 @@ + #include "touchinputdevice.h" + #include "accelinputdevice.h" + #include "keybinputdevice.h" +-#include "sixaxisinputdevice.h" + #include "memutils.h" +-#include <sixaxisclient/sixaxis.h> + #include <QKeyEvent> + #include <QTouchEvent> + +@@ -38,8 +36,7 @@ + + /*! Creates a HostInput object with the given \a emu. */ + HostInput::HostInput(Emu *emu) : +- m_emu(emu), +- m_numSixAxes(0) ++ m_emu(emu) + { + m_padOpacity = emConf.defaultValue("padOpacity").toReal(); + // first device in the list is always touch device ... +@@ -47,16 +44,11 @@ HostInput::HostInput(Emu *emu) : + // ... and second is always the keyboard + m_devices.append(new KeybInputDevice(this)); + m_devices.append(new AccelInputDevice(this)); +- // start sixaxis daemon +- SixAxisDaemon *daemon = SixAxisDaemon::instance(); +- QObject::connect(daemon, SIGNAL(newPad()), SLOT(onSixAxisDetected())); +- daemon->start(); + } + + /*! Destroys HostInput object. */ + HostInput::~HostInput() + { +- SixAxisDaemon::instance()->stop(); + } + + /*! \internal */ +@@ -121,39 +113,6 @@ void HostInput::setupTouchDevice() + m_devices.append(touchDevice); + } + +-/*! \internal */ +-void HostInput::onSixAxisDetected() +-{ +- SixAxisDaemon *daemon = SixAxisDaemon::instance(); +- while (daemon->hasNewPad()) { +- // create new sixaxis +- SixAxis *sixAxis = daemon->nextNewPad(); +- SixAxisInputDevice *sixAxisDev = new SixAxisInputDevice(sixAxis, this); +- int index = m_numSixAxes; +- sixAxisDev->setDeviceIndex(index); +- QObject::connect(sixAxisDev, SIGNAL(destroyed()), SLOT(onSixAxisDestroyed())); +- QObject::connect(sixAxisDev, SIGNAL(pause()), SIGNAL(pause())); +- +- // set Pad A or Pad B emu function +- if (index == 0 || index == 1) +- sixAxisDev->setEmuFunction(index + 1); +- +- m_devices.append(sixAxisDev); +- m_numSixAxes++; +- } +- emit devicesChanged(); +-} +- +-/*! \internal */ +-void HostInput::onSixAxisDestroyed() +-{ +- SixAxisInputDevice *sixAxisInputDevice = static_cast<SixAxisInputDevice *>(sender()); +- if (m_devices.removeOne(sixAxisInputDevice)) { +- m_numSixAxes--; +- emit devicesChanged(); +- } +-} +- + /*! Returns touch input device. */ + TouchInputDevice *HostInput::touchInputDevice() const + { +diff --git a/src/base/hostinput.h b/src/base/hostinput.h +index 8d81547..3d37b4c 100644 +--- a/src/base/hostinput.h ++++ b/src/base/hostinput.h +@@ -51,8 +51,6 @@ signals: + protected: + bool eventFilter(QObject *o, QEvent *e); + private slots: +- void onSixAxisDetected(); +- void onSixAxisDestroyed(); + private: + void processTouch(QEvent *e); + void setupTouchDevice(); +diff --git a/src/emumaster.pro b/src/emumaster.pro +index 8f02f65..763846a 100644 +--- a/src/emumaster.pro ++++ b/src/emumaster.pro +@@ -1,11 +1,9 @@ + TEMPLATE = subdirs + + SUBDIRS += \ +- sixaxisclient \ + base \ + nes gba snes psx amiga pico \ +- diskgallery \ +- sixaxismonitor ++ diskgallery + + # nes gba snes psx amiga pico \ + ++++++ remove_obsolete_check_in_diskgallery.patch (new) --- remove_obsolete_check_in_diskgallery.patch +++ remove_obsolete_check_in_diskgallery.patch @@ -0,0 +1,20 @@ +diff --git a/src/diskgallery/main.cpp b/src/diskgallery/main.cpp +index d4a686f..8cf539f 100644 +--- a/src/diskgallery/main.cpp ++++ b/src/diskgallery/main.cpp +@@ -28,15 +28,6 @@ int main(int argc, char *argv[]) + QApplication app(argc, argv); + + QSystemInfo sysInfo; +- if (sysInfo.version(QSystemInfo::Os) < QString("1.2")) { +- QDeclarativeView view; +- QObject::connect(view.engine(), SIGNAL(quit()), &view, SLOT(close())); +- QString qmlPath = QString("%1/qml/gallery/osVersionError.qml") +- .arg(pathManager.installationDirPath()); +- view.setSource(QUrl::fromLocalFile(qmlPath)); +- view.showFullScreen(); +- return app.exec(); +- } + + Configuration::setupAppInfo(); + pathManager.buildLocalDirTree();
