Commit d683b7be authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge: Improve AppImage content

See merge request !97
parents a6446f0b c7a90404
Pipeline #188508818 passed with stages
in 28 minutes and 46 seconds
......@@ -41,9 +41,8 @@ function copylib()
done
}
# Luckily, This seems to only be an OPTIONAL dependency of libxml. It's huge.
#libicudata \
#libtiff \
# dependency scrapyard
# libstdc++ \
# include libraries
mkdir -p ${APPDIR}/usr/lib/
......@@ -71,7 +70,6 @@ libprotobuf \
libSDL-1.2 \
libslang \
libsndfile \
libstdc++ \
libSDL_image-1.2 \
libSDL_mixer-1.2 \
libtiff \
......
......@@ -36,6 +36,7 @@ file \
g++ \
git \
make \
libasound2-dev \
#libboost-dev \
#libboost-thread-dev \
#libfreetype6-dev \
......@@ -45,6 +46,7 @@ libgl1-mesa-dev \
libglu1-mesa-dev \
libjpeg-dev \
libpng-dev \
libpulse-dev \
#libprotobuf-dev \
#libsdl1.2-dev \
#libsdl-image1.2-dev \
......@@ -53,9 +55,15 @@ libpng-dev \
#libsdl2-image-dev \
#libsdl2-mixer-dev \
#libxml2-dev \
libx11-dev \
#libxext-dev \
#libxt-dev \
#libxv-dev \
#x11proto-core-dev \
libzthread-dev \
pkg-config \
recode \
#zlib1g-dev \
-y
# copy appimage tools
......
......@@ -8,8 +8,26 @@ archive=$1
# if it already exists (Steam SDK), don't bother
test -d /usr/include/SDL && exit 0
# remove system provided libxml2
# rm -f /usr/lib/libxml2.so.2 /usr/lib/x86_64-linux-gnu/libxml2.so.2 /usr/lib/i386-linux-gnu/libxml2.so.2
# from debian
confflags="--disable-rpath --enable-sdl-dlopen \
--disable-video-ggi --disable-video-svga --disable-video-aalib \
--disable-nas --disable-esd --disable-arts \
"
# not taken from debian
# --enable-video-caca \
# --disable-pulseaudio-shared \
# --disable-alsa-shared \
# --disable-x11-shared \
# ours
confflags_ours="--disable-assembly \
--disable-video-fbcon --disable-video-directfb \
--disable-x11-dgamouse --disable-video-dga --disable-dga \
--disable-alsa-test --enable-alsa --disable-arts --disable-esd --enable-audio \
--enable-pulseaudio-shared --enable-alsa-shared --enable-x11-shared"
#--disable-alsa --enable-pulseaudio
# fetch
curl https://www.libsdl.org/release/${archive}.tar.gz -o ${archive}.tar.gz || exit $?
......@@ -20,7 +38,7 @@ rm ${archive}.tar.gz
cd ${archive}
patch -Np1 -i ../libsdl-1.2.15-const-xdata32.patch || exit $?
rm -f ../libsdl-1.2.15-const-xdata32.patch
CFLAGS=-Os ./configure --prefix=/usr/ || exit $?
CFLAGS=-Os ./configure --prefix=/usr/ ${confflags_ours} ${confflags} || exit $?
make -j 5 || exit $?
make install || exit $?
cd .. && rm -rf ${archive}
......
......@@ -7,8 +7,11 @@ archive=$1
# if it already exists (Steam SDK), don't bother
test -r /usr/include/SDL/SDL_image.h && exit 0
# remove system provided libxml2
# rm -f /usr/lib/libxml2.so.2 /usr/lib/x86_64-linux-gnu/libxml2.so.2 /usr/lib/i386-linux-gnu/libxml2.so.2
# from debian, mostly
confflags="--disable-jpg-shared \
--disable-tif \
--disable-png-shared \
"
# fetch
curl https://www.libsdl.org/projects/SDL_image/release/${archive}.tar.gz -o ${archive}.tar.gz || exit $?
......@@ -17,7 +20,7 @@ curl https://www.libsdl.org/projects/SDL_image/release/${archive}.tar.gz -o ${ar
tar -xzf ${archive}.tar.gz
rm ${archive}.tar.gz
cd ${archive}
CFLAGS=-Os ./configure --prefix=/usr/ --disable-tif --disable-webp || exit $?
CFLAGS="-Os -pipe" LDFLAGS="-Wl,--as-needed" ./configure --prefix=/usr/ ${confflags} || exit $?
make -j 5 || exit $?
make install || exit $?
cd .. && rm -rf ${archive}
......
sha256:9c08135f8aeacae81dec4cd0c0ed3de946e065c093ffacbe41c0437a9a54ec22
sha256:989789697662b36778b685d4c0836735502558703ca6bde590b1a5bc2b2c4866
sha256:a0822bde30215040b41799bf874770b0ebe71b3622aeff4aa990cbabd251038f
sha256:b99d5354f16276bb110dd92f8ca76fb0607be85234c5958d0562bae4f43b497a
sha256:3419cb8eaaee3b264a0ff8265eada75a972eb9301285dee33ec79a9698b1477c
sha256:1cef1f8e77209b47918434bb26461671e7b628dfd9440a849755af2550a8c6aa
sha256:dd8e8e2be551b6ad59e90523df009ccd84d747617eeef95982277513c7477c9a
sha256:8810a1c87a4dd7624d715eb829684627b5b16195cb33adba6abef173f6d27630
sha256:952b6b6a801c923d65a4ff6ae4db49929fa81d2bee0339ef27e3d771129025ba
sha256:7f8193f8872fa12bad9462145c350c9b94ee575ddf84c28ec1adf46e886994ac
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