Merge remote-tracking branch 'refs/remotes/tvdzwan/master'

Former-commit-id: d6129482381dba63e5c1a4026932f01a3beafbef

CompileHowto.txt

@@ -23,8 +23,10 @@ git submodule update
 mkdir "$HYPERION_DIR/build"
 cd "$HYPERION_DIR/build"
 
-# run cmake to generate make files on the raspberry pi
+# run cmake to generate make files on the raspberry pi WITHOUT PWM SUPPORT
 cmake  -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+# run cmake to generate make files on the raspberry pi WITH PWM SUPPORT
+cmake -DENABLE_WS2812BPWM=ON -DENABLE_WS281XPWM=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 # or if you are not compiling on the raspberry pi and need to disable the Dispmanx grabber and support for spi devices
 cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_X11=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 # as an alternative for the dispmanx grabber on non-rpi devices (e.g. cubox-i) you could try the framebuffer grabber
@@ -44,7 +46,7 @@ cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_V4L2=OFF -DENABLE_OSX=O
 make
 # or if you have a system with more then 1 cpu core
 make -j 4
-# "4" is  the number of cpu cores (e.g. 4 on RPi2), this makes compile faster
+# "4" is  the number of cpu cores (e.g. 4 on RPi2 and RPi3), this makes compile faster
 
 #after compile, to remove any stuff not needed for a release version.
 strip bin/*

bin/create_all_releases.sh

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

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" \
-	"./hyperiond.sh" \
-	"./hyperion-remote.sh"
+	"./openelec/hyperiond.sh" \
+	"./openelec/hyperion-remote.sh"
 

bin/create_release.sh

@@ -23,18 +23,18 @@ tar --create --verbose --gzip --absolute-names --show-transformed-names --ignore
 	--transform "s:$builddir/bin/:hyperion/bin/:" \
 	--transform "s:$repodir/effects/:hyperion/effects/:" \
 	--transform "s:$repodir/config/:hyperion/config/:" \
-	--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:$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://:/:g" \
 	"$builddir/bin/hyperiond" \
 	"$builddir/bin/hyperion-remote" \
 	"$builddir/bin/hyperion-v4l2" \
-	"$builddir/bin/gpio2spi" \
-	"$builddir/bin/dispmanx2png" \
+	"$builddir/bin/hyperion-x11" \
+	"$builddir/bin/hyperion-dispmanx" \
 	"$repodir/effects/"* \
-	"$repodir/bin/hyperion.init.sh" \
-	"$repodir/bin/hyperion.systemd.sh" \
-	"$repodir/bin/hyperion.initctl.sh" \
+	"$repodir/bin/service/hyperion.init.sh" \
+	"$repodir/bin/service/hyperion.systemd.sh" \
+	"$repodir/bin/service/hyperion.initctl.sh" \
 	"$repodir/config/hyperion.config.json"
 

bin/install_hyperion.sh

@@ -119,10 +119,10 @@ elif [ $CPU_WETEK -eq 1 ]; then
 	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.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
+	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-rpi.tar.gz
+	OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz
 else
 	echo "---> Critical Error: Target platform unknown -> abort"
 	exit 1

bin/remove_hyperion.sh

@@ -94,6 +94,8 @@ 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

deploy/hyperion.deps.openelec-x32x64.tar.gz.REMOVED.git-id

@@ -0,0 +1 @@
+e55dbd6444d070f519115e83e4fda96b6911e5db

deploy/hyperion_rpi.tar.gz.REMOVED.git-id

@@ -1 +1 @@
-6465f4220aa1a8b4bdfed82492bf3ed079f586c4
+465b3cbd6542aab5424b4ef47089cb92137a0af2