Revert "Merge pull request #7 from tvdzwan/master"

This reverts commit ae218b85ff [formerly b57904d64f0fbdd2e97f0326de4378489206e357], reversing changes made to cda2232080 [formerly 6949fe847d9c4181c924a13ed0715ecd71b98499]. Former-commit-id: 0261bc7735663dba45681a5c0e4026b4c1fddeba
2025-03-01 10:33:28 +00:00 · 2016-03-22 23:24:34 +11:00
parent e352dea7a6
commit 9280078cf0
22 changed files with 44 additions and 505 deletions
--- a/bin/create_all_releases.sh
+++ b/bin/create_all_releases.sh
@@ -1,43 +1,43 @@
 #!/bin/sh
 # create all directly for release with -DCMAKE_BUILD_TYPE=Release -Wno-dev
 # Create the x64 build
-mkdir build-x32x64
-cd build-x32x64
+mkdir build-x64
+cd build-x64
 cmake -DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 make -j 4
 cd ..

 # Create the x32 build
-#mkdir build-x32
-#cd build-x32
-#cmake -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
-#make -j 4
-#cd ..
+mkdir build-x32
+cd build-x32
+cmake -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+make -j 4
+cd ..

 # Create the RPI build
 mkdir build-rpi
 cd build-rpi
-cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x32x64/protoc_export.cmake -DENABLE_WS2812BPWM=ON -DENABLE_WS281XPWM=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 make -j 4
 cd ..

 # Create the WETEK build
 mkdir build-wetek
 cd build-wetek
-cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x32x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_FB=ON -DENABLE_AMLOGIC=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_FB=ON -DENABLE_AMLOGIC=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 make -j 4
 cd ..

 # Create the IMX6 build
-#mkdir build-imx6
-#cd build-imx6
-#cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-imx6.cmake" -DIMPORT_PROTOC=../build-x32x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_FB=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
-#make -j 4
-#cd ..
+mkdir build-imx6
+cd build-imx6
+cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-imx6.cmake" -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_FB=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+make -j 4
+cd ..

-bin/create_release.sh . x32x64
-#bin/create_release.sh . x32
+bin/create_release.sh . x64
+bin/create_release.sh . x32
 bin/create_release.sh . rpi
 bin/create_release.sh . wetek
-#bin/create_release.sh . imx6
+bin/create_release.sh . imx6

--- a/bin/create_oe_depedencies.sh
+++ b/bin/create_oe_depedencies.sh
@@ -22,6 +22,6 @@ tar --create --verbose --gzip --absolute-names --show-transformed-names --derefe
 	"$IMX6_ROOTFS/usr/lib/arm-linux-gnueabihf/libXext.so.6" \
 	"$IMX6_ROOTFS/usr/lib/arm-linux-gnueabihf/libXrender.so.1" \
 	"$IMX6_ROOTFS/usr/lib/arm-linux-gnueabihf/libXt.so.6" \
-	"./openelec/hyperiond.sh" \
-	"./openelec/hyperion-remote.sh"
+	"./hyperiond.sh" \
+	"./hyperion-remote.sh"

--- a/bin/create_release.sh
+++ b/bin/create_release.sh
@@ -18,23 +18,23 @@ fi
 outfile="$repodir/deploy/hyperion_$buildid.tar.gz"
 echo create $outfile

-tar --create --gzip --absolute-names --show-transformed-names --ignore-failed-read\
+tar --create --verbose --gzip --absolute-names --show-transformed-names --ignore-failed-read\
 	--file "$outfile" \
 	--transform "s:$builddir/bin/:hyperion/bin/:" \
 	--transform "s:$repodir/effects/:hyperion/effects/:" \
 	--transform "s:$repodir/config/:hyperion/config/:" \
-	--transform "s:$repodir/bin/service/hyperion.init.sh:hyperion/init.d/hyperion.init.sh:" \
-	--transform "s:$repodir/bin/service/hyperion.systemd.sh:hyperion/init.d/hyperion.systemd.sh:" \
-	--transform "s:$repodir/bin/service/hyperion.initctl.sh:hyperion/init.d/hyperion.initctl.sh:" \
+	--transform "s:$repodir/bin/hyperion.init.sh:hyperion/init.d/hyperion.init.sh:" \
+	--transform "s:$repodir/bin/hyperion.systemd.sh:hyperion/init.d/hyperion.systemd.sh:" \
+	--transform "s:$repodir/bin/hyperion.initctl.sh:hyperion/init.d/hyperion.initctl.sh:" \
 	--transform "s://:/:g" \
 	"$builddir/bin/hyperiond" \
 	"$builddir/bin/hyperion-remote" \
 	"$builddir/bin/hyperion-v4l2" \
-	"$builddir/bin/hyperion-x11" \
-	"$builddir/bin/hyperion-dispmanx" \
+	"$builddir/bin/gpio2spi" \
+	"$builddir/bin/dispmanx2png" \
 	"$repodir/effects/"* \
-	"$repodir/bin/service/hyperion.init.sh" \
-	"$repodir/bin/service/hyperion.systemd.sh" \
-	"$repodir/bin/service/hyperion.initctl.sh" \
+	"$repodir/bin/hyperion.init.sh" \
+	"$repodir/bin/hyperion.systemd.sh" \
+	"$repodir/bin/hyperion.initctl.sh" \
 	"$repodir/config/hyperion.config.json"

--- a/bin/openelec/hyperion-remote.sh
+++ b/bin/openelec/hyperion-remote.sh
--- a/bin/service/hyperion.init.sh
+++ b/bin/service/hyperion.init.sh
--- a/bin/service/hyperion.initctl.sh
+++ b/bin/service/hyperion.initctl.sh
--- a/bin/service/hyperion.systemd.sh
+++ b/bin/service/hyperion.systemd.sh
--- a/bin/openelec/hyperiond.sh
+++ b/bin/openelec/hyperiond.sh
--- a/bin/install_hyperion.sh
+++ b/bin/install_hyperion.sh
@@ -31,10 +31,10 @@ OS_OSMC=`grep -m1 -c OSMC /etc/issue`
 CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710' /proc/cpuinfo`
 CPU_IMX6=`grep -m1 -c i.MX6 /proc/cpuinfo`
 CPU_WETEK=`grep -m1 -c Amlogic /proc/cpuinfo`
-CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l`
-#CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l`
+CPU_X64=`uname -m | grep x86_64 | wc -l`
+CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l`
 # Check that we have a known configuration
-if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X32X64 -ne 1 ]; then
+if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X64 -ne 1 ] && [ $CPU_X32 -ne 1 ]; then
 	echo '---> Critical Error: CPU information does not match any known releases -> abort'
 	exit 1
 fi
@@ -117,12 +117,12 @@ elif [ $CPU_IMX6 -eq 1 ]; then
 elif [ $CPU_WETEK -eq 1 ]; then
 	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_wetek.tar.gz
 	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
-elif [ $CPU_X32X64 -eq 1 ]; then
-	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32x64.tar.gz
-	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz
-#elif [ $CPU_X32 -eq 1 ]; then
-#	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32.tar.gz
-#	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz
+elif [ $CPU_X64 -eq 1 ]; then
+	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x64.tar.gz
+	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
+elif [ $CPU_X32 -eq 1 ]; then
+	HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32.tar.gz
+	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz
 else
 	echo "---> Critical Error: Target platform unknown -> abort"
 	exit 1
--- a/bin/remove_hyperion.sh
+++ b/bin/remove_hyperion.sh
@@ -64,7 +64,7 @@ fi
 #Disabling and delete service files
 if [ $USE_INITCTL -eq 1 ]; then
 	echo '---> Delete and disable Hyperion initctl script'
-	rm -v /etc/init/hyperion.conf 2>/dev/null
+	rm -v /etc/init/hyperion 2>/dev/null
 	initctl reload-configuration
 elif [ $OS_OPENELEC -eq 1 ]; then
 	# Remove Hyperion from OpenELEC autostart.sh
@@ -94,8 +94,6 @@ else
 	rm -v /usr/bin/hyperiond 2>/dev/null
 	rm -v /usr/bin/hyperion-remote 2>/dev/null
 	rm -v /usr/bin/hyperion-v4l2 2>/dev/null
-	rm -v /usr/bin/hyperion-dispmanx 2>/dev/null
-	rm -v /usr/bin/hyperion-x11 2>/dev/null
 	rm -v /etc/hyperion.config.json 2>/dev/null
 	echo "---> Remove binaries"
 	rm -rv /opt/hyperion 2>/dev/null