[oe-commits] org.oe.dev opie-mediaplayer1-lib{wav, mad, tremor}plugin: revert unneded fixes, except for PR bumps

[polyonymous commit]

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

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: af468c484cd21adad38d1f1ab295de630f7894ef
ViewMTN: http://monotone.openembedded.org/revision.psp?id=af468c484cd21adad38d1f1ab295de630f7894ef
Files:
1
packages/opie-mediaplayer1-libwavplugin/files
packages/opie-mediaplayer1-libwavplugin/files/destdir.patch
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/opie-mediaplayer1-libwavplugin_cvs.bb
Diffs:

#
# mt diff -re2afe354f0e9c52826f2f55366cd10b894b2eb6d -raf468c484cd21adad38d1f1ab295de630f7894ef
#
# 
# 
# delete "packages/opie-mediaplayer1-libwavplugin/files"
# 
# delete "packages/opie-mediaplayer1-libwavplugin/files/destdir.patch"
# 
# patch "packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro"
#  from [af2c15e25462c0634cd098bbff2c2e593156494d]
#    to [dda536508722358b74adc4ecc64a88fe1228e820]
# 
# patch "packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb"
#  from [cc80c483e6526b83c43c059b6cabf7f9f90dbec3]
#    to [6045a18bba4a9fca7e8227e6742c0c8f5352b4b4]
# 
# patch "packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro"
#  from [010368afae70d6fb80bfbe8f3f42273461c6efc7]
#    to [a0a68a5c6d6bfac37ce1965bbff271ea7a626bfa]
# 
# patch "packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb"
#  from [c2c06d5be1c4777afa341f1e33023eaf4eac097c]
#    to [2f6b1f689e924424711365d6f8f0ffdc344618e1]
# 
# patch "packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb"
#  from [791c26fe641d21376e5c9c7a6111cac515b60794]
#    to [e47267b95c4e2d7989c4e8c7d14a41af34693522]
# 
============================================================
--- packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro	af2c15e25462c0634cd098bbff2c2e593156494d
+++ packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro	dda536508722358b74adc4ecc64a88fe1228e820
@@ -1,9 +1,9 @@ TARGET   	= madplugin
 TEMPLATE 	= lib
 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
============================================================
--- packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb	cc80c483e6526b83c43c059b6cabf7f9f90dbec3
+++ packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb	6045a18bba4a9fca7e8227e6742c0c8f5352b4b4
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
============================================================
--- packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro	010368afae70d6fb80bfbe8f3f42273461c6efc7
+++ packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin/vorbis.pro	a0a68a5c6d6bfac37ce1965bbff271ea7a626bfa
@@ -1,9 +1,9 @@ TARGET    =   tremorplugin
 TEMPLATE  =   lib
 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
============================================================
--- packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb	c2c06d5be1c4777afa341f1e33023eaf4eac097c
+++ packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb	2f6b1f689e924424711365d6f8f0ffdc344618e1
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://vorbis.pro "
============================================================
--- packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb	791c26fe641d21376e5c9c7a6111cac515b60794
+++ packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb	e47267b95c4e2d7989c4e8c7d14a41af34693522
@@ -1,7 +1,6 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
-	file://destdir.patch;patch=1 "