Bob Mottram 8 лет назад
Родитель
Сommit
b085af0b18
2 измененных файлов: 33 добавлений и 1 удалений
  1. 32
    0
      src/freedombone-app-tox
  2. 1
    1
      src/freedombone-image-customise

+ 32
- 0
src/freedombone-app-tox Просмотреть файл

46
 TOXIC_COMMIT='cf16849b374e484a33a4dffa3dfb937b59d537f2'
46
 TOXIC_COMMIT='cf16849b374e484a33a4dffa3dfb937b59d537f2'
47
 TOXIC_FILE=/usr/local/bin/toxic
47
 TOXIC_FILE=/usr/local/bin/toxic
48
 
48
 
49
+QTOX_REPO="https://github.com/bashrc/qTox"
50
+QTOX_COMMIT='acd303514116b9a47818bd3e67f84a009acbea35'
51
+
52
+function mesh_tox_qtox {
53
+	chroot "${rootdir}" apt-get -y install build-essential libatk1.0-0 libbz2-1.0 libc6 libcairo2 libdbus-1-3 libegl1-mesa libfontconfig1 libfreetype6 libgcc1 libgdk-pixbuf2.0-0 libgl1-mesa-glx libglib2.0-0 libgtk2.0-0 libice6 libicu52 libjpeg62-turbo libmng1 libmtdev1 libopenal1 libopus0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpng12-0 libqrencode3 libsm6 libsodium13 libsqlite3-0 libssl1.0.0 libstdc++6 libtiff5 libudev1 libvpx1 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwebp5 libx11-6 libx11-xcb1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxext6 libxfixes3 libxi6 libxrender1 libxss1 zlib1g libopus-dev libvpx-dev
54
+	chroot "${rootdir}" apt-get -y install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev ffmpeg libsqlcipher-dev libopus-dev libvpx-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libavcodec-dev libavcodec56 libavcodec57 libavfilter-dev libavfilter6
55
+    #chroot "${rootdir}" apt-get -y install --force-yes tox-ffmpeg-dev
56
+	if [ ! ${rootdir}$INSTALL_DIR ]; then
57
+		INSTALL_DIR=${rootdir}/root/build
58
+	fi
59
+
60
+	if [ ! -d ${rootdir}$INSTALL_DIR ]; then
61
+		mkdir -p ${rootdir}$INSTALL_DIR
62
+	fi
63
+
64
+	git clone $QTOX_REPO ${rootdir}$INSTALL_DIR/qtox
65
+	if [ ! -d ${rootdir}$INSTALL_DIR/qtox ]; then
66
+		exit 72428
67
+	fi
68
+	cd ${rootdir}${INSTALL_DIR}/qtox
69
+	git checkout $QTOX_COMMIT -b $QTOX_COMMIT
70
+	chroot ${rootdir} /bin/bash -x <<EOF
71
+cd ${INSTALL_DIR}/qtox
72
+qmake
73
+make
74
+make install
75
+EOF
76
+	if [ ! -f /usr/local/bin/qtox ]; then
77
+		exit 75784
78
+	fi
79
+}
80
+
49
 function reconfigure_tox {
81
 function reconfigure_tox {
50
 	echo -n ''
82
 	echo -n ''
51
 }
83
 }

+ 1
- 1
src/freedombone-image-customise Просмотреть файл

687
 	if [[ $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'i386' ]]; then
687
 	if [[ $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'i386' ]]; then
688
 		# Tox user interface
688
 		# Tox user interface
689
 		enable_tox_repo
689
 		enable_tox_repo
690
-		# TODO: this may not work on all architectures
690
+		#mesh_tox_qtox
691
 		chroot "$rootdir" apt-get -y --force-yes install qtox
691
 		chroot "$rootdir" apt-get -y --force-yes install qtox
692
 	fi
692
 	fi
693
 
693