]> git.openpandora.org Git - openembedded.git/commitdiff
opie-mediaplayer1-lib{wav,mad,tremor}plugin: revert unneded fixes, except for PR...
authorMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 20:24:37 +0000 (20:24 +0000)
committerMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 20:24:37 +0000 (20:24 +0000)
packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro
packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
packages/opie-mediaplayer1-libwavplugin/files/.mtn2git_empty [deleted file]
packages/opie-mediaplayer1-libwavplugin/files/destdir.patch [deleted file]
packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb

index 854675cd7ccd7bf7d15a54b96489e9d78361fec4..0a8d410e4747f5a2d015bda018c9ac2634b8e7bb 100644 (file)
@@ -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
index 13418e2b760bc44c03139826096601eedb4753bb..4fafc8f530994d72158a5d8def49e51d21b8f908 100644 (file)
@@ -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"
index 22d0eba7a0ed0e08ed335e689b4160f0fbecff49..c1e0350cc7a231498194e34862582fc23dbc3815 100644 (file)
@@ -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
index d8ffda5d8769109c492e8fb619019bb399d66eb0..0fd327d1262e3c074abd78e533431864c1bbe4b1 100644 (file)
@@ -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
+++ /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
index c7a8367d38c1f5c5cf0a4adaa852efc7dcad3549..ca4c49ee3a33142caa2f58c2e9df88b423c35dd7 100644 (file)
@@ -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 "