mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-15 19:31:42 +00:00
Added MPV to Jessie desktop, separate xorg.conf for sunxi FB turbo, further fixes. TESTED
This commit is contained in:
Igor Pečovnik
parent
aa7829434c
commit
02d6146f11
4 changed files with 87 additions and 70 deletions
17
config/xorg.conf.sunxi
Normal file
17
config/xorg.conf.sunxi
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Section "Device"
|
||||
Identifier "Allwinner A10/A13 FBDEV"
|
||||
Driver "fbturbo"
|
||||
Option "fbdev" "/dev/fb0"
|
||||
Option "HWCursor" "false"
|
||||
Option "SwapbuffersWait" "true"
|
||||
EndSection
|
||||
Section "Monitor"
|
||||
Identifier "Monitor0"
|
||||
Option "DPMS" "false"
|
||||
EndSection
|
||||
Section "ServerFlags"
|
||||
Option "BlankTime" "0"
|
||||
Option "StandbyTime" "0"
|
||||
Option "SuspendTime" "0"
|
||||
Option "OffTime" "0"
|
||||
EndSection
|
||||
|
|
@ -162,7 +162,7 @@ if [[ $BUILD_DESKTOP == yes ]]; then
|
|||
PAKETKI="$PAKETKI mozo pluma iceweasel icedove"
|
||||
;;
|
||||
jessie)
|
||||
PAKETKI="$PAKETKI mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove"
|
||||
PAKETKI="$PAKETKI mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove mpv"
|
||||
;;
|
||||
trusty)
|
||||
PAKETKI="$PAKETKI libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends"
|
||||
|
|
|
|||
123
desktop.sh
123
desktop.sh
|
|
@ -11,53 +11,46 @@
|
|||
|
||||
|
||||
install_desktop (){
|
||||
#--------------------------------------------------------------------------------------------------------------------------------
|
||||
#---------------------------------------------------------------------------------------------------------------------------------
|
||||
# Install desktop with HW acceleration
|
||||
#--------------------------------------------------------------------------------------------------------------------------------
|
||||
#---------------------------------------------------------------------------------------------------------------------------------
|
||||
display_alert "Installing desktop" "XFCE" "info"
|
||||
|
||||
umount $DEST/cache/sdcard/tmp >/dev/null 2>&1
|
||||
mount --bind $SRC/lib/bin/ $DEST/cache/sdcard/tmp
|
||||
|
||||
# Debian Wheezy
|
||||
#--------------------------------------------------------------------------------------------------------------------------------
|
||||
if [[ $RELEASE == "wheezy" ]]; then
|
||||
# copy wallpapers and default desktop settings
|
||||
d=$DEST/cache/sdcard/usr/share/xfce4/backdrops/
|
||||
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
|
||||
#cp $SRC/lib/config/wheezy-desktop.tgz /tmp/kernel # start configuration
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/wheezy-desktop.tgz -C /root/"
|
||||
# copy wallpapers and default desktop settings
|
||||
d=$DEST/cache/sdcard/usr/share/xfce4/backdrops/
|
||||
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/wheezy-desktop.tgz -C /root/"
|
||||
fi
|
||||
|
||||
# Debian Jessie
|
||||
#--------------------------------------------------------------------------------------------------------------------------------
|
||||
if [[ $RELEASE == "jessie" ]]; then
|
||||
# copy wallpapers
|
||||
d=$DEST/cache/sdcard/usr/share/backgrounds/xfce/
|
||||
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
|
||||
#cp $SRC/lib/config/jessie-desktop.tgz /tmp/kernel # start configuration
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/jessie-desktop.tgz -C /root/"
|
||||
# copy wallpapers and default desktop settings
|
||||
d=$DEST/cache/sdcard/usr/share/backgrounds/xfce/
|
||||
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/jessie-desktop.tgz -C /root/"
|
||||
fi
|
||||
|
||||
# Ubuntu trusty
|
||||
#--------------------------------------------------------------------------------------------------------------------------------
|
||||
if [[ $RELEASE == "trusty" ]]; then
|
||||
# copy wallpapers and default desktop settings
|
||||
d=$DEST/cache/sdcard/usr/share/backgrounds/xfce/
|
||||
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
|
||||
#cp $SRC/lib/config/trusty-desktop.tgz /tmp/kernel # start configuration
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/trusty-desktop.tgz -C /root/"
|
||||
# copy wallpapers and default desktop settings
|
||||
d=$DEST/cache/sdcard/usr/share/backgrounds/xfce/
|
||||
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/trusty-desktop.tgz -C /root/"
|
||||
fi
|
||||
|
||||
# Install custom icons and theme
|
||||
#cp $SRC/lib/bin/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb /tmp/kernel
|
||||
#cp $SRC/lib/bin/NumixHolo.zip /tmp/kernel
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "dpkg -i /tmp/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "unzip -qq /tmp/NumixHolo.zip -d /usr/share/themes"
|
||||
# cleanup
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y autoremove >/dev/null 2>&1"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "apt-get clean >/dev/null 2>&1"
|
||||
|
||||
# unmount bind mount
|
||||
umount $DEST/cache/sdcard/tmp >/dev/null 2>&1
|
||||
|
||||
# fix for udoo
|
||||
|
|
@ -70,54 +63,46 @@ fi
|
|||
sed "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=true/g" -i $DEST/cache/sdcard/etc/default/nodm
|
||||
|
||||
# Compile Turbo Frame buffer for sunxi
|
||||
if [[ $LINUXCONFIG == *sun* && $BRANCH != "next" ]]; then
|
||||
# quemu bug walkaround
|
||||
git clone 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"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && ./configure --prefix=/usr"
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && make && make install && cp xorg.conf /etc/X11/xorg.conf"
|
||||
if [[ $LINUXFAMILY == *sun* && $BRANCH == "default" ]]; then
|
||||
|
||||
display_alert "Compiling FB Turbo" "sunxi" "info"
|
||||
|
||||
local 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
|
||||
# A
|
||||
git clone https://github.com/linux-sunxi/libvdpau-sunxi.git $DEST/cache/sdcard/tmp/libvdpau-sunxi
|
||||
# temporaly fix
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "cd /tmp/libvdpau-sunxi; git checkout 906c36ed45ceb53fecd5fc72e821c11849eeb1a3; make"
|
||||
d=$DEST/cache/sdcard/usr/lib/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 $d/libvdpau_sunxi.so.1
|
||||
# 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
|
||||
|
||||
# B
|
||||
# git clone https://github.com/Snaipe/libcsptr.git $DEST/cache/sdcard/usr/local/src/libcsptr
|
||||
# chroot $DEST/cache/sdcard /bin/bash -c "cd /usr/local/src/libcsptr && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && make && make install"
|
||||
# chroot $DEST/cache/sdcard /bin/bash -c "cd /usr/local/src/libcsptr && make"
|
||||
# chroot $DEST/cache/sdcard /bin/bash -c "cd /usr/local/src/libcsptr && make install"
|
||||
# display_alert "GIT clone" "libvdpau-sunxi" "info"
|
||||
# echo -e "[\e[0;34m git cloning \x1B[0m] libvdpau-sunxi ..."
|
||||
# git clone -b staging https://github.com/rellla/libvdpau-sunxi.git $DEST/cache/sdcard/usr/local/src/libvdpau-sunxi
|
||||
# chroot $DEST/cache/sdcard /bin/bash -c "cd /usr/local/src/libvdpau-sunxi && make clean && make $CTHREADS ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- && make install"
|
||||
|
||||
# That we can just play
|
||||
echo "export VDPAU_DRIVER=sunxi" >> $DEST/cache/sdcard/etc/profile
|
||||
# enable memory reservations
|
||||
sed "s/sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 //g" -i $DEST/cache/sdcard/boot/boot.cmd
|
||||
mkimage -C none -A arm -T script -d $DEST/cache/sdcard/boot/boot.cmd $DEST/cache/sdcard/boot/boot.scr >> /dev/null
|
||||
# clean deb cache
|
||||
chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y clean >/dev/null 2>&1"
|
||||
fi
|
||||
|
||||
if [[ $LINUXCONFIG == *sunxi* ]]; then
|
||||
# disable DPMS for sunxi because screen doesn't resume
|
||||
cat >> $DEST/cache/sdcard/etc/X11/xorg.conf <<EOT
|
||||
Section "Monitor"
|
||||
Identifier "Monitor0"
|
||||
Option "DPMS" "false"
|
||||
EndSection
|
||||
Section "ServerFlags"
|
||||
Option "BlankTime" "0"
|
||||
Option "StandbyTime" "0"
|
||||
Option "SuspendTime" "0"
|
||||
Option "OffTime" "0"
|
||||
EndSection
|
||||
EOT
|
||||
# That we can just play
|
||||
echo "export VDPAU_DRIVER=sunxi" >> $DEST/cache/sdcard/etc/profile
|
||||
|
||||
# enable memory reservations
|
||||
sed "s/sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 //g" -i $DEST/cache/sdcard/boot/boot.cmd
|
||||
mkimage -C none -A arm -T script -d $DEST/cache/sdcard/boot/boot.cmd $DEST/cache/sdcard/boot/boot.scr >> /dev/null
|
||||
|
||||
# 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
|
||||
}
|
||||
|
|
|
|||
15
patch/kernel/sunxi-dev/banana-otg2host.patch
Normal file
15
patch/kernel/sunxi-dev/banana-otg2host.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index fd7594f..817a942
|
||||
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
|
||||
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
|
||||
@@ -269,7 +269,7 @@
|
||||
};
|
||||
|
||||
&usb_otg {
|
||||
- dr_mode = "otg";
|
||||
+ dr_mode = "host";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
Loading…
Add table
Reference in a new issue