summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2021-07-15 16:30:23 +0200
committerØrjan Malde <red@foxi.me>2021-07-15 16:30:23 +0200
commitc745859d6df023e41a48763c0c5f6689a858b2fc (patch)
tree5fc392ce10f73336209bbc7b4da05a51f0ca156b
parent338ba76750b8ac0fca0a949228328a8800be56d0 (diff)
downloadmidipix_build-c745859d6df023e41a48763c0c5f6689a858b2fc.tar.bz2
midipix_build-c745859d6df023e41a48763c0c5f6689a858b2fc.tar.xz
groups/251.native_packages_lib.group: move libass
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups/251.native_packages_lib.group7
-rw-r--r--groups/261.native_packages_x11.group8
2 files changed, 7 insertions, 8 deletions
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index f6a34025..35da8b4d 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -3,7 +3,7 @@
#
GROUP_TARGET="native_packages";
NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
-glib jansson lame libarchive libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
+glib jansson lame libarchive libass libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
libevent libfastjson libfetch libffi libfirm libflac libgcrypt libgpg_error libidn2 libite
libjpeg_turbo libksba libmad libmspack libmp3splt libogg libpcap libpipeline libpng libpsl
readline libredwg libressl libsasl2 libshine libsndfile libsolv libssh
@@ -28,6 +28,11 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
: ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.xz};
: ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
: ${PKG_LIBARCHIVE_LIBTOOL:=rlibtool};
+: ${PKG_LIBASS_DEPENDS:="freetype harfbuzz fribidi"};
+: ${PKG_LIBASS_SHA256SUM:=1cdd39c9d007b06e737e7738004d7f38cf9b1e92843f37307b24e7ff63ab8e53};
+: ${PKG_LIBASS_VERSION:=0.15.1};
+: ${PKG_LIBASS_URL:=https://github.com/libass/libass/releases/download/${PKG_LIBASS_VERSION}/libass-${PKG_LIBASS_VERSION}.tar.xz};
+: ${PKG_LIBASS_CONFIGURE_ARGS_EXTRA:="--disable-asm"};
: ${PKG_LIBASSUAN_DEPENDS:="libgpg_error"};
: ${PKG_LIBASSUAN_SHA256SUM:=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4};
: ${PKG_LIBASSUAN_VERSION:=2.5.5};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index d72880d3..a87eb33d 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -4,7 +4,7 @@
GROUP_TARGET="native_packages";
NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
atk cairo fontconfig freetype freetype_pre fribidi gdk glew gtk2 harfbuzz imlib2
-libass libcaca libepoxy libfontenc libICE libpthread_stubs libSM libX11 libXau
+libcaca libepoxy libfontenc libICE libpthread_stubs libSM libX11 libXau
libXaw libXdamage libXdmcp libXext libXfixes libXfont2 libXft libXi libxkbfile
libXmu libXpm libXt libXtst libXcursor mesa pango pixman rdesktop rxvt_unicode
st util_macros xcb xcb_proto xcb_util xcb_util_image xcb_util_wm xcowsay xcalc
@@ -72,12 +72,6 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
: ${PKG_IMLIB2_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
: ${PKG_IMLIB2_CONFIGURE_ARGS_EXTRA:="--disable-static --disable-mmx --disable-amd64"};
: ${PKG_IMLIB2_LIBTOOL=rdlibtool};
-: ${PKG_LIBASS_DEPENDS:="freetype harfbuzz fribidi"};
-: ${PKG_LIBASS_SHA256SUM:=1cdd39c9d007b06e737e7738004d7f38cf9b1e92843f37307b24e7ff63ab8e53};
-: ${PKG_LIBASS_VERSION:=0.15.1};
-: ${PKG_LIBASS_URL:=https://github.com/libass/libass/releases/download/${PKG_LIBASS_VERSION}/libass-${PKG_LIBASS_VERSION}.tar.xz};
-: ${PKG_LIBASS_CONFIGURE_ARGS_EXTRA:="--disable-asm"};
-: ${PKG_LIBASS_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/harfbuzz -I${PREFIX_NATIVE}/include/fribidi"};
: ${PKG_LIBCACA_DEPENDS:="freetype ncursesw"};
: ${PKG_LIBCACA_URLS_GIT:=libcaca=https://github.com/cacalabs/libcaca@master};
: ${PKG_LIBCACA_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -std=gnu99"};