OpieRec: libopie -> libopie2

4 files changed, 8 insertions, 6 deletions

diff --git a/noncore/multimedia/opierec/config.in b/noncore/multimedia/opierec/config.in
index fe195bc..36a87c9 100644
--- a/noncore/multimedia/opierec/config.in
+++ b/noncore/multimedia/opierec/config.in
@@ -1,4 +1,4 @@
   config OPIEREC
     boolean "opie-rec (simple audio recording/playing app)"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp
index 74a175b..bb51446 100644
--- a/noncore/multimedia/opierec/main.cpp
+++ b/noncore/multimedia/opierec/main.cpp
@@ -20,9 +20,11 @@ int main(int argc, char* argv[]) {
 }
 
 
 #else
-#include <opie/oapplicationfactory.h>
+
+#include <opie2/oapplicationfactory.h>
+
 OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
 
 #endif
 
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index eb7e5d1..5ac3513 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -3,8 +3,8 @@ Files: bin/opierec pics/opierec apps/Applications/opierec.desktop
 Priority: optional
 Section: opie/multimedia
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: audio sampling recorder
  A simple audio recording/playing application.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 8b06edb..6393252 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -18,12 +18,12 @@ SOURCES   = adpcm.c \
 INTERFACES  =
 
 contains(CONFIG, pdaudio) {
 #  LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
-  LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz
+  LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2
   INCLUDEPATH += $(QPEDIR)/include
   DEPENDPATH  += $(QPEDIR)/include
-  DEFINES += PDAUDIO 
+  DEFINES += PDAUDIO
   DEFINES += THREADED
   TARGET    = qperec
 
 #  DESTDIR=$(QPEDIR)/bin
@@ -32,9 +32,9 @@ contains(CONFIG, pdaudio) {
 contains(CONFIG, opie) {
   INCLUDEPATH += $(OPIEDIR)/include
   DEPENDPATH  += $(OPIEDIR)/include
   DESTDIR=$(OPIEDIR)/bin
-  LIBS            += -lqpe -lpthread
+  LIBS            += -lqpe -lopiecore2 -lpthread
   TARGET    = opierec
   include ( $(OPIEDIR)/include.pro )
 }