diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index 6f455da..16828fa 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -43,6 +43,7 @@ INITIAL_CFLAGS=$CFLAGS INITIAL_CPPFLAGS=$CPPFLAGS INITIAL_PKG_CONFIG_PATH=$PKG_CONFIG_PATH INITIAL_XDG_DATA_DIRS=$XDG_DATA_DIRS +INITIAL_ACLOCAL_PATH=$ACLOCAL_PATH DRY_RUN= FORCE= @@ -142,7 +143,7 @@ md5() { } remove_recursive() { - rm -f "$1/$2" + rm -f $1/$2 for FILE in $1; do if [ -d "$1/$FILE" ]; then remove_recursive "$1/$FILE" $2 @@ -242,7 +243,8 @@ set_environment_vars() { export CFLAGS="-I$ENVDEPS_PACKET_DIR/include $INITIAL_CFLAGS" export CPPFLAGS="-I$ENVDEPS_PACKET_DIR/include $INITIAL_CPPFLAGS" export PKG_CONFIG_PATH="$ENVDEPS_PACKET_DIR/lib/pkgconfig:$INITIAL_PKG_CONFIG_PATH" - export XDG_DATA_DIRS="$ENVDEPS_PACKET_DIR/share:$INITIAL_XDG_DATA_DIRS" + export XDG_DATA_DIRS="$ENVDEPS_PACKET_DIR/share:$INITIAL_XDG_DATA_DIRS" + export ACLOCAL_PATH="$ENVDEPS_PACKET_DIR/share/aclocal:$INITIAL_ACLOCAL_PATH" } call_packet_function() { diff --git a/docker-builder-data/build/script/packet/boost-1.61.0.sh b/docker-builder-data/build/script/packet/boost-1.61.0.sh index c74affc..21e7868 100644 --- a/docker-builder-data/build/script/packet/boost-1.61.0.sh +++ b/docker-builder-data/build/script/packet/boost-1.61.0.sh @@ -21,4 +21,6 @@ pkinstall() { if ! ./b2 install; then return 1 fi + rm -rf "$INSTALL_RELEASE_PACKET_DIR/include" + remove_recursive "$INSTALL_RELEASE_PACKET_DIR/lib" *.a } diff --git a/docker-builder-data/build/script/packet/cmake-3.6.2.sh b/docker-builder-data/build/script/packet/cmake-3.6.2.sh index 9f4b532..9efc248 100644 --- a/docker-builder-data/build/script/packet/cmake-3.6.2.sh +++ b/docker-builder-data/build/script/packet/cmake-3.6.2.sh @@ -4,6 +4,8 @@ PK_DIRNAME="cmake-3.6.2" PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="https://cmake.org/files/v3.6/$PK_ARCHIVE" +PK_CONFIGURE_OPTIONS_DEFAULT="--prefix=$INSTALL_PACKET_DIR" + source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh source $INCLUDE_SCRIPT_DIR/inc-pkbuild-default.sh source $INCLUDE_SCRIPT_DIR/inc-pkinstall-default.sh diff --git a/docker-builder-data/build/script/packet/ffmpeg-2.4.13.sh b/docker-builder-data/build/script/packet/ffmpeg-2.4.13.sh new file mode 100644 index 0000000..5330420 --- /dev/null +++ b/docker-builder-data/build/script/packet/ffmpeg-2.4.13.sh @@ -0,0 +1,15 @@ +DEPS="sdl-1.2.15 yasm-1.3.0 lame-3.99.5 ogg-1.3.2 theora-1.1.1 vorbis-1.3.5 x264-master" + +PK_DIRNAME="ffmpeg-2.4.13" +PK_ARCHIVE="$PK_DIRNAME.tar.bz2" +PK_URL="http://ffmpeg.org/releases/$PK_ARCHIVE" + +PK_CONFIGURE_OPTIONS=" \ + --enable-rpath \ + --enable-gpl \ + --enable-libx264 \ + --enable-libmp3lame \ + --enable-libtheora \ + --enable-libvorbis" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh b/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh index d1ec5f4..1abc53d 100644 --- a/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh +++ b/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh @@ -6,7 +6,7 @@ # + vorbis # + x264 -DEPS="sdl-2.0.5 yasm-1.3.0 lame-3.99.5 ogg-1.3.2 theora-1.1.1 vorbis-1.3.5 x264-master" +DEPS="sdl-1.2.15 yasm-1.3.0 lame-3.99.5 ogg-1.3.2 theora-1.1.1 vorbis-1.3.5 x264-master" PK_DIRNAME="ffmpeg-3.1.5" PK_ARCHIVE="$PK_DIRNAME.tar.bz2" diff --git a/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh b/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh new file mode 100644 index 0000000..a5fe5ff --- /dev/null +++ b/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh @@ -0,0 +1,9 @@ +DEPS="" + +PK_DIRNAME="fontconfig-2.11.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://www.freedesktop.org/software/fontconfig/release/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkbuild-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkinstall-default.sh diff --git a/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh b/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh index dd2c0c8..39db45e 100644 --- a/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh +++ b/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh @@ -4,6 +4,8 @@ PK_DIRNAME="gdk-pixbuf-2.36.0" PK_ARCHIVE="$PK_DIRNAME.tar.xz" PK_URL="https://download.gnome.org/sources/gdk-pixbuf/2.36/$PK_ARCHIVE" -PK_CONFIGURE_OPTIONS="--enable-introspection=yes" +PK_CONFIGURE_OPTIONS=" \ + --enable-introspection=yes \ + --enable-relocations=yes " source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh b/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh index 281d618..b5eb049 100644 --- a/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh +++ b/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh @@ -1,4 +1,4 @@ -DEPS="gtk-3.22.2" +DEPS="gtk-3.14.14" PK_DIRNAME="gnome-themes-standard-3.22.2" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/gtk-3.14.14.sh b/docker-builder-data/build/script/packet/gtk-3.14.14.sh new file mode 100644 index 0000000..d4782bc --- /dev/null +++ b/docker-builder-data/build/script/packet/gtk-3.14.14.sh @@ -0,0 +1,7 @@ +DEPS="epoxy-master rsvg-2.40.16 atk-2.22.0 atspi2atk-2.22.0 gdkpixbuf-2.36.0 cairo-1.14.6 pango-1.40.3" + +PK_DIRNAME="gtk+-3.14.14" +PK_ARCHIVE="$PK_DIRNAME.tar.xz" +PK_URL="https://download.gnome.org/sources/gtk+/3.14/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh b/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh index 5fb3a32..1fb8ba9 100644 --- a/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh +++ b/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh @@ -1,4 +1,4 @@ -DEPS="gtk-3.22.2 atkmm-2.22.7 cairomm-1.10.0 pangomm-2.34.0" +DEPS="gtk-3.14.14 atkmm-2.22.7 cairomm-1.10.0 pangomm-2.34.0" PK_DIRNAME="gtkmm-3.14.0" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/jack-0.125.0.sh b/docker-builder-data/build/script/packet/jack-0.125.0.sh index f68fd05..843c018 100644 --- a/docker-builder-data/build/script/packet/jack-0.125.0.sh +++ b/docker-builder-data/build/script/packet/jack-0.125.0.sh @@ -4,4 +4,6 @@ PK_DIRNAME="jack-audio-connection-kit-0.125.0" PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="http://jackaudio.org/downloads/$PK_ARCHIVE" -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkbuild-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkinstall-default.sh diff --git a/docker-builder-data/build/script/packet/mlt-0.9.6.sh b/docker-builder-data/build/script/packet/mlt-0.9.6.sh new file mode 100644 index 0000000..0c97fe6 --- /dev/null +++ b/docker-builder-data/build/script/packet/mlt-0.9.6.sh @@ -0,0 +1,15 @@ +DEPS="ffmpeg-3.1.5 xml-2.9.4 fftw-3.3.5 samplerate-0.1.9 sox-14.4.2 sdl-1.2.15 jack-0.125.0 glib-2.50.0" + +PK_DIRNAME="mlt-0.9.6" +PK_ARCHIVE="v0.9.6.tar.gz" +PK_URL="https://github.com/mltframework/mlt/archive/$PK_ARCHIVE" + +PK_CONFIGURE_OPTIONS=" \ + --enable-gpl \ + --disable-decklink \ + --disable-gtk2 \ + --disable-opengl \ + --disable-qt" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + diff --git a/docker-builder-data/build/script/packet/mlt-6.2.0.sh b/docker-builder-data/build/script/packet/mlt-6.2.0.sh index 72c7fec..7c1bf7f 100644 --- a/docker-builder-data/build/script/packet/mlt-6.2.0.sh +++ b/docker-builder-data/build/script/packet/mlt-6.2.0.sh @@ -7,7 +7,7 @@ # + jack # + glib -DEPS="ffmpeg-3.1.5 xml-2.9.4 fftw-3.3.5 samplerate-0.1.9 sdl-2.0.5 jack-0.125.0 glib-2.50.0" +DEPS="ffmpeg-3.1.5 xml-2.9.4 fftw-3.3.5 samplerate-0.1.9 sox-14.4.2 sdl-1.2.15 jack-0.125.0 glib-2.50.0" PK_DIRNAME="mlt-6.2.0" PK_ARCHIVE="v6.2.0.tar.gz" diff --git a/docker-builder-data/build/script/packet/pango-1.40.3.sh b/docker-builder-data/build/script/packet/pango-1.40.3.sh index 0efd514..5f8894d 100644 --- a/docker-builder-data/build/script/packet/pango-1.40.3.sh +++ b/docker-builder-data/build/script/packet/pango-1.40.3.sh @@ -1,4 +1,4 @@ -DEPS="harfbuzz-1.3.2 fontconfig-2.12.1 cairo-1.14.6 gobjectintrospection-1.50.0" +DEPS="harfbuzz-1.3.2 fontconfig-2.11.0 cairo-1.14.6 gobjectintrospection-1.50.0" PK_DIRNAME="pango-1.40.3" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/sdl-1.2.15.sh b/docker-builder-data/build/script/packet/sdl-1.2.15.sh new file mode 100644 index 0000000..b816bcf --- /dev/null +++ b/docker-builder-data/build/script/packet/sdl-1.2.15.sh @@ -0,0 +1,9 @@ +DEPS="" + +PK_DIRNAME="SDL-1.2.15" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://www.libsdl.org/release/$PK_ARCHIVE" + +PK_CONFIGURE_OPTIONS_DEFAULT="--prefix=$INSTALL_PACKET_DIR" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh index 3094710..f8c7d2b 100644 --- a/docker-builder-data/build/script/packet/synfigcore-master.sh +++ b/docker-builder-data/build/script/packet/synfigcore-master.sh @@ -77,6 +77,7 @@ pkbuild() { autoreconf --install --force || return 1 ./configure \ --prefix=$INSTALL_PACKET_DIR \ + --sysconfdir=$INSTALL_PACKET_DIR/etc \ --with-boost-libdir=$ENVDEPS_PACKET_DIR/lib \ --without-opengl || return 1 set_done $NAME build.configure diff --git a/docker-builder-data/build/script/packet/synfigetl-master.sh b/docker-builder-data/build/script/packet/synfigetl-master.sh index 5b9325b..f968c70 100644 --- a/docker-builder-data/build/script/packet/synfigetl-master.sh +++ b/docker-builder-data/build/script/packet/synfigetl-master.sh @@ -10,7 +10,10 @@ pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME/ETL" || return 1 if ! check_packet_function $NAME build.configure; then autoreconf --install --force || return 1 - ./configure --prefix=$INSTALL_PACKET_DIR || return 1 + ./configure \ + --prefix=$INSTALL_PACKET_DIR \ + --sysconfdir=$INSTALL_PACKET_DIR/etc \ + || return 1 set_done $NAME build.configure fi make -j${THREADS} || return 1 diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh new file mode 100755 index 0000000..eef73c2 --- /dev/null +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +OLDDIR=`pwd` +SCRIPT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" +BASE_DIR=`dirname "$SCRIPT_DIR"` + +export LD_LIBRARY_PATH="$BASE_DIR/lib:$BASE_DIR/lib64:$LD_LIBRARY_PATH" +export XDG_DATA_DIRS="$BASE_DIR/share:$XDG_DATA_DIRS" +export QT_XKB_CONFIG_ROOT=$QT_XKB_CONFIG_ROOT:/usr/local/share/X11/xkb:/usr/share/X11/xkb + +export SYNFIG_ROOT="$BASE_DIR" +export SYNFIG_MODULE_LIST="$BASE_DIR/etc/synfig_modules.cfg" +export MLT_DATA="$BASE_DIR/share/mlt/" +export MLT_REPOSITORY="$BASE_DIR/lib/mlt/" +export MAGICK_CODER_FILTER_PATH="$BASE_DIR/lib/ImageMagick-6.9.6/config-Q16/" +export MAGICK_CODER_MODULE_PATH="$BASE_DIR/lib/ImageMagick-6.9.6/modules-Q16/coders/" +export MAGICK_CONFIGURE_PATH="$BASE_DIR/lib/ImageMagick-6.9.6/modules-Q16/filters/" + +cd "$BASE_DIR/bin" +if [ "$1" = "run" ]; then + "${@:2}" || (cd "$OLDDIR" && return $?) +elif [ -z "$2" ]; then + "$BASE_DIR/bin/synfigstudio.wrapper" "$@" || (cd "$OLDDIR" && return $?) +else + "$BASE_DIR/bin/synfig" "$@" || (cd "$OLDDIR" && return $?) +fi +cd "$OLDDIR" diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/synfigstudio.desktop b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/synfigstudio.desktop new file mode 100644 index 0000000..799d6b3 --- /dev/null +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/synfigstudio.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Synfig Studio +Exec=launch.sh +Icon=synfigstudio +Categories=Graphics diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/synfigstudio.png b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/synfigstudio.png new file mode 100644 index 0000000..3f09db5 Binary files /dev/null and b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/synfigstudio.png differ diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.sh new file mode 100644 index 0000000..91629b1 --- /dev/null +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.sh @@ -0,0 +1,69 @@ +DEPS="appimagekit-master synfigstudio-master" + +PK_APPIMAGEKIT_DIR=$PACKET_DIR/appimagekit-master/ +PK_APPDIR_NAME="synfigstudio" + +pk_synfigstudio_appimage_cplib() { + cp --remove-destination /lib/x86_64-linux-gnu/$1* "$2" \ + || cp --remove-destination /lib/i386-linux-gnu/$1* "$2" \ + || cp --remove-destination /usr/lib/x86_64-linux-gnu/$1* "$2" \ + || cp --remove-destination /usr/lib/i386-linux-gnu/$1* "$2" \ + || return 1 +} + +pkinstall() { + # copy files from envdeps (install requires envdeps explicit) + + local APPDIR="$INSTALL_PACKET_DIR/$PK_APPDIR_NAME.AppDir" + mkdir -p "$APPDIR/usr" + mkdir -p "$APPDIR/usr/bin" + mkdir -p "$APPDIR/usr/lib" + + cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/" || return 1 + cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/desktopintegration" "$APPDIR/usr/bin/synfigstudio.wrapper"|| return 1 + cp --remove-destination "$FILES_PACKET_DIR/synfigstudio.desktop" "$APPDIR/" || return 1 + cp --remove-destination "$FILES_PACKET_DIR/synfigstudio.png" "$APPDIR/" || return 1 + cp --remove-destination "$FILES_PACKET_DIR/launch.sh" "$APPDIR/usr/bin/" || return 1 + + pk_synfigstudio_appimage_cplib libudev "$APPDIR/usr/lib/" || return 1 + pk_synfigstudio_appimage_cplib libgfortran "$APPDIR/usr/lib/" || return 1 + pk_synfigstudio_appimage_cplib libffi "$APPDIR/usr/lib/" || return 1 + pk_synfigstudio_appimage_cplib libdb "$APPDIR/usr/lib/" || return 1 + pk_synfigstudio_appimage_cplib libpcre "$APPDIR/usr/lib/" || return 1 + pk_synfigstudio_appimage_cplib libdirect "$APPDIR/usr/lib/" || return 1 + pk_synfigstudio_appimage_cplib libfusion "$APPDIR/usr/lib/" || return 1 +} + +pkinstall_release() { + if ! copy "$INSTALL_PACKET_DIR" "$INSTALL_RELEASE_PACKET_DIR"; then + return 1 + fi + + # copy files from envdeps_release (install_release requires envdeps_release explicit) + + local APPDIR="$INSTALL_RELEASE_PACKET_DIR/$PK_APPDIR_NAME.AppDir" + copy "$ENVDEPS_RELEASE_PACKET_DIR" "$APPDIR/usr" || return 1 + + # clean bin + rm -f $APPDIR/usr/bin/* || return 1 + cp $INSTALL_PACKET_DIR/$PK_APPDIR_NAME.AppDir/usr/bin/* $APPDIR/usr/bin/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/bin/melt $APPDIR/usr/bin/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/bin/identify $APPDIR/usr/bin/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/bin/synfig $APPDIR/usr/bin/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/bin/synfigstudio $APPDIR/usr/bin/ || return 1 + + # clean boost + rm -f $APPDIR/usr/lib/libboost_* || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_chrono.* $APPDIR/usr/lib/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_filesystem.* $APPDIR/usr/lib/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_program_options.* $APPDIR/usr/lib/ || return 1 + cp $ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_system.* $APPDIR/usr/lib/ || return 1 + + cd "$INSTALL_RELEASE_PACKET_DIR" || return 1 + rm -f "$PK_APPDIR_NAME.tar.gz" || return 1 + tar -czf "$PK_APPDIR_NAME.tar.gz" "$PK_APPDIR_NAME.AppDir" || return 1 + rm -f "$INSTALL_RELEASE_PACKET_DIR/$PK_APPDIR_NAME.appimage" || return 1 + AppImageAssistant "$APPDIR" "$INSTALL_RELEASE_PACKET_DIR/$PK_APPDIR_NAME.appimage" || return 1 + + rm -rf "$APPDIR" +} diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index 1062862..e3bf20b 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -30,7 +30,10 @@ pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME/synfig-studio" || return 1 if ! check_packet_function $NAME build.configure; then ./bootstrap.sh || return 1 - ./configure --prefix=$INSTALL_PACKET_DIR || return 1 + ./configure \ + --prefix=$INSTALL_PACKET_DIR \ + --sysconfdir=$INSTALL_PACKET_DIR/etc \ + || return 1 set_done $NAME build.configure fi make -j${THREADS} || return 1 diff --git a/docker-builder-data/build/script/packet/yasm-1.3.0.sh b/docker-builder-data/build/script/packet/yasm-1.3.0.sh index 29f59b0..66379ca 100644 --- a/docker-builder-data/build/script/packet/yasm-1.3.0.sh +++ b/docker-builder-data/build/script/packet/yasm-1.3.0.sh @@ -4,4 +4,6 @@ PK_DIRNAME="yasm-1.3.0" PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="http://www.tortall.net/projects/yasm/releases/$PK_ARCHIVE" -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkbuild-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkinstall-default.sh diff --git a/docker-builder-i386/Dockerfile b/docker-builder-i386/Dockerfile index 436dc6f..283eeac 100644 --- a/docker-builder-i386/Dockerfile +++ b/docker-builder-i386/Dockerfile @@ -1,4 +1,5 @@ FROM my/debian-i386:wheezy +ARG ALL_PROXY # Update RUN apt-get -yq update @@ -27,34 +28,38 @@ RUN apt-get -yq install \ libglib2.0-dev \ libglu1-mesa-dev -# xcb (for qt) -#RUN apt-get -yq install \ -# libxcb1-dev \ -# libxcb-glx0-dev \ -# libxcb-icccm4-dev \ -# libxcb-image0-dev \ -# libxcb-keysyms1-dev \ -# libxcb-randr0-dev \ -# libxcb-render0-dev \ -# libxcb-render-util0-dev \ -# libxcb-shape0-dev \ -# libxcb-sync0-dev \ -# libxcb-shm0-dev \ -# libxcb-xfixes0-dev \ -# libxcb-xinerama0-dev - # other deps RUN apt-get -yq install liblzma-dev RUN apt-get -yq install liblzo2-dev +RUN apt-get -yq install libudev-dev +RUN apt-get -yq install libfuse-dev +RUN apt-get -yq install libdb-dev +RUN apt-get -yq install libasound2-dev + RUN apt-get -yq install gfortran RUN apt-get -yq install csh RUN apt-get -yq install xsltproc -RUN apt-get -yq install libudev-dev RUN apt-get -yq install m4 -RUN apt-get -yq install libfuse-dev +RUN apt-get -yq install automake +RUN apt-get -yq install intltool +RUN apt-get -yq install libtool + RUN apt-get -yq install git RUN apt-get -yq install wget RUN apt-get -yq install bzip2 -CMD mkdir /build +RUN apt-get -yq install libffi-dev +RUN apt-get -yq install libmount-dev +RUN apt-get -yq install libbz2-dev +RUN apt-get -yq install libdbus-1-dev +RUN apt-get -yq install libcroco3-dev +RUN apt-get -yq install flex +RUN apt-get -yq install bison +RUN apt-get -yq install python-dev +RUN apt-get -yq install libxtst-dev +RUN apt-get -yq install xutils-dev +RUN apt-get -yq install libegl1-mesa-dev +RUN apt-get -yq install libdirectfb-dev + +RUN mkdir /build diff --git a/docker-builder/Dockerfile b/docker-builder/Dockerfile index b1cd69b..d8da353 100644 --- a/docker-builder/Dockerfile +++ b/docker-builder/Dockerfile @@ -60,5 +60,6 @@ RUN apt-get -yq install python-dev RUN apt-get -yq install libxtst-dev RUN apt-get -yq install xutils-dev RUN apt-get -yq install libegl1-mesa-dev +RUN apt-get -yq install libdirectfb-dev RUN mkdir /build