Python3 compatibility fix

README.md

@@ -1,7 +1,5 @@
-# mediaplayer2
-mediaplayer2 is enigma2 plugin based on OpenPli mediaplayer plugin with added support for subssupport plugin for enhanced subtitles support.
+# mediaplayer3
+mediaplayer3 is enigma2 plugin based on OpenPli mediaplayer plugin with added support for subssupport plugin for enhanced subtitles support.
+Based on Mediaplayer2 from https://github.com/mx3L/mediaplayer2
 
-[Download latest versions](http://dl.bintray.com/mx3l/generic/)
-
-[More information] (https://code.google.com/p/mediaplayer2-for-sh4/)
 

create_ipk.sh

@@ -14,8 +14,8 @@ GITVER=$(git log -1 --format="%ci" | awk -F" " '{ print $1 }' | tr -d "-")
 #DSTAGEVER="6"
 VER=$PVER-$GITVER
 
-PKG=${D}/enigma2-plugin-extensions-mediaplayer2_${VER}_all
-PLUGINPATH=/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer2
+PKG=${D}/enigma2-plugin-extensions-mediaplayer3_${VER}_all
+PLUGINPATH=/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer3
 popd &> /dev/null
 
 rm -rf ${D}/ipkg.src*
@@ -29,21 +29,21 @@ mkdir -p ${S}
 git archive --format=tar HEAD | (cd ${S} && tar xf -)
 
 cat > ${P}/CONTROL/control << EOF
-Package: enigma2-plugin-extensions-mediaplayer2
+Package: enigma2-plugin-extensions-mediaplayer3
 Version: ${VER}
 Architecture: all
 Section: extra
 Priority: optional
 Maintainer: mxfitsat@gmail.com
 Depends: enigma2-plugin-extensions-subssupport (>=1.5.1)
 Recommends: python-sqlite3
-Homepage: https://code.google.com/p/mediaplayer2-for-sh4/
+Homepage: https://github.com/onni-k/mediaplayer3
 Description: MediaPlayer with external subtitle support $VER
 EOF
 
 cat > ${P}/CONTROL/postrm << EOF
 #!/bin/sh
-rm -r /usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer2 2> /dev/null
+rm -r /usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer3 2> /dev/null
 exit 0
 EOF
 
@@ -58,7 +58,7 @@ languages=($(ls -d */ | gsed 's/\/$//g; s/.*\///g'))
 cd -
 for lang in "${languages[@]}" ; do
 	printf "Generating mo files for %s\n" $lang
-	msgfmt ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer2.po -o ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer2.mo
+	msgfmt ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer3.po -o ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer3.mo
 done
 
 #echo "compiling to optimized python bytecode"
@@ -68,9 +68,9 @@ done
 find ${P} -name "*.pyo" -print -exec rm {} \;
 find ${P} -name "*.pyc" -print -exec rm {} \;
 
-mkdir -p ${P}/tmp/mediaplayer2
-mkdir -p ${P}/tmp/mediaplayer2/python2.6/
-mkdir -p ${P}/tmp/mediaplayer2/python2.7/
+mkdir -p ${P}/tmp/mediaplayer3
+mkdir -p ${P}/tmp/mediaplayer3/python2.6/
+mkdir -p ${P}/tmp/mediaplayer3/python2.7/
 
 tar -C ${P} -cz --format=gnu -f ${B}/data.tar.gz . --exclude=CONTROL
 tar -C ${P}/CONTROL -cz --format=gnu -f ${B}/control.tar.gz .

enigma2-plugin-extensions-mediaplayer2_0.62.bb

@@ -1,5 +1,5 @@
-SUMMARY = "MediaPlayer2 for Enigma2"
-HOMEPAGE = "https://github.com/mx3L/mediaplayer2"
+SUMMARY = "MediaPlayer3 for Enigma2"
+HOMEPAGE = "https://github.com/onni-k/mediaplayer3"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
@@ -9,7 +9,7 @@ SRCREV = "3a21a388e7326cba690666cec5324f8da35d50d8"
 PV = "0.62"
 PR = "r0"
 
-SRC_URI = "git://github.com/mx3L/mediaplayer2;protocol=git;branch=master"
+SRC_URI = "git://github.com/onni-k/mediaplayer3;protocol=git;branch=master"
 
 S = "${WORKDIR}/git"
 
@@ -23,12 +23,12 @@ do_compile () {
 }
 
 do_install () {
-    mkdir -p ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2
-    cp -r ${S}/plugin/* ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2/
+    mkdir -p ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer3
+    cp -r ${S}/plugin/* ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer3/
 }
 
 pkg_postrm_${PN} () {
-    rm -rf ${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2
+    rm -rf ${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer3
 }
 
 FILES_${PN} = "${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2"

install.sh

@@ -55,13 +55,13 @@ fi
 echo "installing '${IPK_NAME}' to $E2_HOST..."
 if [ -f "$with_pass" ]; then
 	sshpass -p $E2_PASSWORD ssh $E2_USERNAME@$E2_HOST <<- EOFSSH > /dev/null
-		opkg remove enigma2-plugin-extensions-mediaplayer2
+		opkg remove enigma2-plugin-extensions-mediaplayer3
 		opkg --force-downgrade install /tmp/$IPK_NAME
 		rm /tmp/$IPK_NAME
 	EOFSSH
 else
 	ssh $E2_USERNAME@$E2_HOST <<- EOFSSH > /dev/null
-		opkg remove enigma2-plugin-extensions-mediaplayer2
+		opkg remove enigma2-plugin-extensions-mediaplayer3
 		opkg --force-downgrade install /tmp/$IPK_NAME
 		rm /tmp/$IPK_NAME
 	EOFSSH