opie-mediaplayer1-lib{wav,mad,tremor}plugin: revert unneded fixes, except for PR...

diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
index 854675c..0a8d410 100644 (file)
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
@@ -3,7 +3,7 @@ CONFIG          +=  qt warn_on
 HEADERS        = libmadplugin.h libmadpluginimpl.h
 SOURCES        = libmadplugin.cpp libmadpluginimpl.cpp
 TARGET         = madplugin
-DESTDIR        = $(palmtopdir)/plugins/codecs
+DESTDIR        = $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ..
 LIBS            += -lqpe -lm -lmad

diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
index 13418e2..4fafc8f 100644 (file)
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
           file://libmadplugin.pro"

diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro
index 22d0eba..c1e0350 100644 (file)
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro
@@ -3,7 +3,7 @@ CONFIG    +=  qt warn_on
 HEADERS   =   libtremorplugin.h libtremorpluginimpl.h
 SOURCES         =   libtremorplugin.cpp libtremorpluginimpl.cpp
 TARGET    =   tremorplugin
-DESTDIR   =   ${palmtopdir}/plugins/codecs
+DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include .. tremor
 DEPENDPATH      +=  $(OPIEDIR)/include .. tremor 
 LIBS            +=  -lqpe -lm -lvorbisidec

diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
index d8ffda5..0fd327d 100644 (file)
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
           file://vorbis.pro "

diff --git a/packages/opie-mediaplayer1-libwavplugin/files/.mtn2git_empty b/packages/opie-mediaplayer1-libwavplugin/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/opie-mediaplayer1-libwavplugin/files/destdir.patch b/packages/opie-mediaplayer1-libwavplugin/files/destdir.patch
deleted file mode 100644 (file)
index 74e2576..0000000
--- a/packages/opie-mediaplayer1-libwavplugin/files/destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wavplugin.pro b/wavplugin.pro
-index da89490..d26355b 100644
---- a/wavplugin.pro
-+++ b/wavplugin.pro
-@@ -3,7 +3,7 @@ CONFIG         +=  qt plugin warn_on
- HEADERS               =   wavplugin.h wavpluginimpl.h
- SOURCES               =   wavplugin.cpp wavpluginimpl.cpp
- TARGET                =   wavplugin
--DESTDIR               =   $(OPIEDIR)/plugins/codecs
-+DESTDIR               =   ${palmtopdir}/plugins/codecs
- INCLUDEPATH += $(OPIEDIR)/include ..
- DEPENDPATH      +=   ..
- LIBS            +=  -lqpe

diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
index c7a8367..ca4c49e 100644 (file)
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
@@ -1,7 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
-       file://destdir.patch;patch=1 "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "