Commit 2da6c926 authored by Dmitry Blinov's avatar Dmitry Blinov

make proview-r compile and run (again)

straighetend the configs:
no more custom source packages
using xvfb for proview compilation (easier)
fix bug with pwr pre-build process killing itself
parent eff75cb3
......@@ -162,12 +162,15 @@ recipe = slapos.recipe.cmmi
shared = true
url = https://github.com/anholt/libepoxy/releases/download/1.5.3/libepoxy-1.5.3.tar.xz
md5sum = e2845de8d2782b2d31c01ae8d7cd4cbb
location = ${buildout:parts-directory}/${:_buildout_section_name_}
#location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-command =
sed -i '20s/value: true/value: false/' ${:location}__compile__/libepoxy-1.5.3/meson_options.txt
#sed -i '20s/value: true/value: false/' $${:location}__compile__/libepoxy-1.5.3/meson_options.txt
echo "current working directory is `pwd`" &&\
sed -i '20s/value: true/value: false/' meson_options.txt &&\
mkdir build && cd build && \
${meson:location}/bin/meson --prefix=${:location} \
..
${meson:location}/bin/meson --prefix=%(prefix)s \
#$${meson:location}/bin/meson --prefix=$${:location} \
make-binary = cd build && ${ninja:location}/bin/ninja
environment =
PATH=${ninja:location}/bin:${pkgconfig:location}/bin:${cmake:location}/bin:%(PATH)s
......@@ -330,9 +333,9 @@ environment =
recipe = slapos.recipe.cmmi
#url = https://iweb.dl.sourceforge.net/project/proview/proview/proviewr_${:version}/pwrsrc_${:version}.tar.gz
#md5sum = 2431b0ffec0de9e2d7b1a984b2e216a2
#url = https://github.com/siamect/proview/archive/cc5abd7852b38ae8007d8eedb36acc3a38e4b90d.tar.gz
url = https://github.com/siamect/proview/archive/cc5abd7852b38ae8007d8eedb36acc3a38e4b90d.tar.gz
# XXX - this URL is same as above URL but folder we reduced the folder name to simply pwr. This solve the problem of path too long.
url = https://softinst56570.host.vifib.net/public/cc5abd785.tar.gz
#url = https://softinst56570.host.vifib.net/public/cc5abd785.tar.gz
version = 5.6.1-1
version = cc5abd7
location = ${buildout:parts-directory}/${:_buildout_section_name_}
......@@ -340,8 +343,8 @@ aroot=${:location}/local/adm
keep-compile-dir = true
incdir = -I${libdb:location}/include -I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui -I${qt4-qmake:location}/include/Qt -I${alsa:location}/include -I${phonon-qt4:location}/include
libs = -L${libdb:location}/lib -ldb_cxx-5 -L${gettext:location}/lib -L${alsa:location}/lib -L${zlib:location}/lib -L ${qt4-qmake:location}/lib -L${phonon-qt4:location}/lib -L${flex:location}/lib
compile-dir = ${:location}__compile__/pwrsrc_${:version}
compile-dir = ${:location}__compile__/pwr
compile-dir = ${:location}__compile__/proview-${:version}*
#compile-dir = ${:location}__compile__/pwr
configure-command =
sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh
sed -i "s#cflags\s*:= -c#cflags := ${:incdir} -c#" ${:compile-dir}/src/tools/bld/src/*/hw_x86_64/variables.mk
......@@ -369,12 +372,22 @@ depends =
${xorg-input-kbd:location}
${xorg-video-vesa:location}
# Start dummy Xserver required to build without display. See: https://github.com/siamect/proview#building-without-a-display
#PID=`pgrep -u "$(whoami)" -f ${xserver:location}/bin/Xorg`
# ${xserver:location}/bin/Xorg -noreset +extension GLX +extension RANDR +extension RENDER -config ${:compile-dir}/pwr/src/tools/dummy_display/xorg.conf :99 &
pre-build =
PID=`pgrep -u "$(whoami)" -f ${xserver:location}/bin/Xorg`
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xvfb.*'`
echo 'I GOT THROUGH PID'
echo " PID is $PID "
echo "other possibly different PID is `pgrep -f vfb` "
echo "my own process is $$"
echo "my command name is `ps -ly $$`"
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
${xserver:location}/bin/Xorg -noreset +extension GLX +extension RANDR +extension RENDER -config ${:compile-dir}/pwr/src/tools/dummy_display/xorg.conf :99 &
echo 'I GOT THROUGH IF'
${xserver:location}/bin/Xvfb -noreset +extension GLX +extension RANDR +extension RENDER :99 &
post-install =
PID=`pgrep -u "$(whoami)" -f ${xserver:location}/bin/Xorg`
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xvfb.*'`
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
make-targets =
......
......@@ -51,7 +51,7 @@ filename = instance-proview-r.cfg.jinja2.in
[template-pwrp-profile]
<= download-base
md5sum = f980d5a843b8e93287dc704b26e413f3
md5sum = 2318cb7175e025ce0409bb182a09f525
filename = pwrp_profile.in
[template-pwrrt]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment