Desktop-extras for Jessie-desktop

config/mpv.conf.sunxi

@@ -0,0 +1,3 @@
+vo=vdpau
+hwdec=vdpau
+hwdec-codecs=all

desktop.sh

@@ -69,61 +69,103 @@ sed "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=false/g" -i $DEST/cache/sdcard/etc/defau
 if [[ $LINUXFAMILY == *sun* && $BRANCH == "default" ]]; then
 	mkdir -p $DEST/cache/sdcard/etc/udev/rules.d
 	cp $SRC/lib/config/sunxi-udev/* $DEST/cache/sdcard/etc/udev/rules.d/
-
-	grep "CONFIG_MALI is not set" $SOURCES/$LINUXSOURCEDIR/.config 2>&1 >/dev/null
-	local error_num=$?
-	grep "CONFIG_UMP is not set" $SOURCES/$LINUXSOURCEDIR/.config 2>&1 >/dev/null
-	if [[ $? -eq 1 && $error_num -eq 1 ]]
-	then
-	error_num=0
-	display_alert "Adding support for Mali - acceleration" "sunxi" "info"
-	git clone -q https://github.com/WereCatf/armbian-debs.git $DEST/cache/sdcard/tmp/armbian-debs
-	chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"	
-	chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y install libdri2-1 libdri2-dev 2>&1 >/dev/null"
-	if [ $? -gt 0 ]; then
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libdri2-1_1.0-1_armhf.deb 2>&1 >/dev/null"
-	error_num=$(($error_num+$?))
-	fi
-	if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali - libdri2-1" "err"; exit 1
-	else
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libump_3.0-0sunxi1_armhf.deb libump-dev_3.0-0sunxi1_armhf.deb 2>&1 >/dev/null"
-	error_num=$(($error_num+$?))
-	if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali - libump" "err"; exit 1
-	else
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i sunxi-mali-r3p0_4.0.0.0_armhf.deb 2>&1 >/dev/null"
-	error_num=$(($error_num+$?))
-	chroot $DEST/cache/sdcard /bin/bash -c "ldconfig"
-	if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali r3p0" "err"; exit 1;fi
-	fi
-	fi
-	fi
-
-	display_alert "Compiling FB Turbo" "sunxi" "info"
-
-	error_num=0
-	
-	# quemu bug walkaround
-	git clone -q https://github.com/ssvb/xf86-video-fbturbo.git $DEST/cache/sdcard/tmp/xf86-video-fbturbo
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && autoreconf -vi >/dev/null 2>&1"
-	error_num=$(($error_num+$?))
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && ./configure --prefix=/usr >/dev/null 2>&1"
-	error_num=$(($error_num+$?))
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && make $CTHREADS && make install >/dev/null 2>&1"	
-	error_num=$(($error_num+$?))
- 
-	# use Armbian prepared config
 	cp $SRC/lib/config/xorg.conf.sunxi $DEST/cache/sdcard/etc/X11/xorg.conf
- 
-	# compile video acceleration
-	git clone -q https://github.com/linux-sunxi/libvdpau-sunxi.git $DEST/cache/sdcard/tmp/libvdpau-sunxi 
-	
-	# with temporaly fix
-	chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/libvdpau-sunxi; git checkout 906c36ed45ceb53fecd5fc72e821c11849eeb1a3; make $CTHREADS" >/dev/null 2>&1	
-	error_num=$(($error_num+$?))	
-	
-	d=$DEST/cache/sdcard/usr/lib/arm-linux-gnueabihf/vdpau
-	test -d "$d" || mkdir -p "$d" && cp $DEST/cache/sdcard/tmp/libvdpau-sunxi/libvdpau_sunxi.so.1 "$d"
-	ln -s $d/libvdpau_sunxi.so.1 $d/libvdpau_sunxi.so
+
+	if [[ $RELEASE == "jessie" || $RELEASE == "xenial" ]]; then
+		cp -R $SRC/lib/bin/sunxi-debs $DEST/cache/sdcard/tmp/debs
+		error_num=0
+		display_alert "Installing desktop-extras for sunxi" "sunxi" "info"
+		chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y install libdri2-1 2>&1 >/dev/null"
+		if [ $? -gt 0 ]; then
+			chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libdri2*.deb 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			fi
+		chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"	
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libump*.deb 2>&1 >/dev/null"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libcedrus*.deb 2>&1 >/dev/null"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libvdpau*.deb 2>&1 >/dev/null"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i sunxi-mali*.deb 2>&1 >/dev/null"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i fbturbo*.deb 2>&1 >/dev/null"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i mpv_*.deb 2>&1 >/dev/null"
+		chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y -f install 2>&1 >/dev/null"
+		error_num=$(($error_num+$?))
+		if [ $error_num -gt 0 ]; then display_alert "Installation failed" "desktop-extras for sunxi" "err"; exit 1;fi
+		# Disable compositing by default
+		sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $DEST/cache/sdcard/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+		sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $DEST/cache/sdcard/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+		cp $SRC/lib/config/mpv.conf.sunxi $DEST/cache/sdcard/etc/mpv/mpv.conf
+		chroot $DEST/cache/sdcard /bin/bash -c "ldconfig"
+
+		else
+
+		grep "CONFIG_MALI is not set" $SOURCES/$LINUXSOURCEDIR/.config 2>&1 >/dev/null
+		local error_num=$?
+		grep "CONFIG_UMP is not set" $SOURCES/$LINUXSOURCEDIR/.config 2>&1 >/dev/null
+		if [[ $? -eq 1 && $error_num -eq 1 ]]; then
+			error_num=0
+			display_alert "Adding support for Mali - acceleration" "sunxi" "info"
+			git clone -q https://github.com/WereCatf/armbian-debs.git $DEST/cache/sdcard/tmp/armbian-debs
+			chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"	
+			chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y install libdri2-1 libdri2-dev 2>&1 >/dev/null"
+			if [ $? -gt 0 ]; then
+				chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libdri2-1_1.0-1_armhf.deb 2>&1 >/dev/null"
+				error_num=$(($error_num+$?))
+				fi
+			if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali - libdri2-1" "err"; exit 1
+				else
+				chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libump_3.0-0sunxi1_armhf.deb libump-dev_3.0-0sunxi1_armhf.deb 2>&1 >/dev/null"
+				error_num=$(($error_num+$?))
+				if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali - libump" "err"; exit 1
+					else
+					chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i sunxi-mali-r3p0_4.0.0.0_armhf.deb 2>&1 >/dev/null"
+					error_num=$(($error_num+$?))
+					chroot $DEST/cache/sdcard /bin/bash -c "ldconfig"
+					if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali r3p0" "err"; exit 1;fi
+					fi
+				fi
+			fi
+
+		display_alert "Compiling FB Turbo" "sunxi" "info"
+		error_num=0
+		# quemu bug walkaround
+		git clone -q https://github.com/ssvb/xf86-video-fbturbo.git $DEST/cache/sdcard/tmp/xf86-video-fbturbo
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && autoreconf -vi >/dev/null 2>&1"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && ./configure --prefix=/usr >/dev/null 2>&1"
+		error_num=$(($error_num+$?))
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && make $CTHREADS && make install >/dev/null 2>&1"	
+		error_num=$(($error_num+$?))
+		# compile video acceleration
+		git clone -q https://github.com/linux-sunxi/libvdpau-sunxi.git $DEST/cache/sdcard/tmp/libvdpau-sunxi 
+		# with temporaly fix
+		chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/libvdpau-sunxi; git checkout 906c36ed45ceb53fecd5fc72e821c11849eeb1a3; make $CTHREADS" >/dev/null 2>&1	
+		error_num=$(($error_num+$?))
+
+		d=$DEST/cache/sdcard/usr/lib/arm-linux-gnueabihf/vdpau
+		test -d "$d" || mkdir -p "$d" && cp $DEST/cache/sdcard/tmp/libvdpau-sunxi/libvdpau_sunxi.so.1 "$d"
+		ln -s $d/libvdpau_sunxi.so.1 $d/libvdpau_sunxi.so
+		# error check
+		if [ $error_num -gt 0 ]; then display_alert "Compiling failed" "FB Turbo" "err"; exit 1; fi
+		fi
+
+	# Set default audio-output to HDMI for desktop-images
+	cat >> $DEST/cache/sdcard/etc/asound.conf << _EOF_
+pcm.!default {
+    type hw
+    card 1
+}
+
+ctl.!default {
+    type hw
+    card 1
+}
+_EOF_
 
 	# That we can just play
 	echo "export VDPAU_DRIVER=sunxi" >> $DEST/cache/sdcard/etc/profile
@@ -135,7 +177,5 @@ if [[ $LINUXFAMILY == *sun* && $BRANCH == "default" ]]; then
 	# clean deb cache
 	chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y clean >/dev/null 2>&1"	
 	
-	# error chech
-	if [ $error_num -gt 0 ]; then display_alert "Compiling failed" "FB Turbo" "err"; exit 1; fi
 fi
 }