diff options
Diffstat (limited to 'graphics-libs')
117 files changed, 972 insertions, 301 deletions
diff --git a/graphics-libs/babl/DETAILS b/graphics-libs/babl/DETAILS index 6319270d0f..fdf800db10 100755 --- a/graphics-libs/babl/DETAILS +++ b/graphics-libs/babl/DETAILS @@ -1,9 +1,9 @@ . "$GRIMOIRE/FUNCTIONS" . "$GRIMOIRE/MESON_FUNCTIONS" SPELL=babl - VERSION=0.1.98 + VERSION=0.1.106 SOURCE="${SPELL}-${VERSION}.tar.xz" - SOURCE_HASH=sha512:33b2e3f8fbcd6602bb82d6242dd2911bb2232e69350f7a0e70e14b1472052e27b0e2a1fa6a2b6d0449fc9796353336e311c8d4007c532447cd61f95b684a3120 + SOURCE_HASH=sha512:97dc57141754ff64a961f77df50dcd91b32d3cf26efa8ba9f3dd5fcfae41e96f986178a04ba7a8940effb6e6e33ac98b163551f377dc781308c750222efb4943 SOURCE_URL[0]=https://download.gimp.org/pub/${SPELL}/${VERSION%.*}/${SOURCE} SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://gegl.org/babl/" diff --git a/graphics-libs/babl/HISTORY b/graphics-libs/babl/HISTORY index ecfe46f307..d2126c188c 100644 --- a/graphics-libs/babl/HISTORY +++ b/graphics-libs/babl/HISTORY @@ -1,13 +1,19 @@ +2023-12-07 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: version 0.1.106 … this installs babl-0.1,pc, + not babl.pc + * UP_TRIGGERS: handle the .pc file change (which needs to be + recorded in .pc of dependents). + 2022-11-13 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 0.1.98 2022-08-27 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 0.1.96 - * patches/0001-Fix-build-error-with-meson-0.62.2.patch: removed + * patches/0001-Fix-build-error-with-meson-0.62.2.patch: removed 2022-06-13 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 0.1.92 - * PRE_BUILD, patches/0001-Fix-build-error-with-meson-0.62.2.patch: + * PRE_BUILD, patches/0001-Fix-build-error-with-meson-0.62.2.patch: fix build with meson 0.62.2 2022-05-28 Florian Franzmann <bwlf@bandrate.org> diff --git a/graphics-libs/babl/UP_TRIGGERS b/graphics-libs/babl/UP_TRIGGERS new file mode 100755 index 0000000000..8735201a56 --- /dev/null +++ b/graphics-libs/babl/UP_TRIGGERS @@ -0,0 +1,2 @@ +# Spell version 0.1.106 moved to babl-0.1.pc. +cast_dependents_versionjump $SPELL $VERSION 0.1.106 diff --git a/graphics-libs/coin/0001-fix-compile-error.patch b/graphics-libs/coin/0001-fix-compile-error.patch index 1fb686a89e..d974f32c69 100644 --- a/graphics-libs/coin/0001-fix-compile-error.patch +++ b/graphics-libs/coin/0001-fix-compile-error.patch @@ -1,5 +1,5 @@ From f7f50e5b77017e0f67bb4898f2917351906b86eb Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <siflfran@hawo.net> +From: Florian Franzmann <bwlf@bandrate.org> Date: Sat, 27 Aug 2016 11:18:48 +0200 Subject: [PATCH] fix compile error diff --git a/graphics-libs/fcft/CONFIGURE b/graphics-libs/fcft/CONFIGURE new file mode 100755 index 0000000000..9f48d22f39 --- /dev/null +++ b/graphics-libs/fcft/CONFIGURE @@ -0,0 +1 @@ +. "${GRIMOIRE}/MESON_CONFIGURE" diff --git a/graphics-libs/fcft/DEPENDS b/graphics-libs/fcft/DEPENDS new file mode 100755 index 0000000000..6ae071bba0 --- /dev/null +++ b/graphics-libs/fcft/DEPENDS @@ -0,0 +1,27 @@ +. "${GRIMOIRE}/MESON_DEPENDS" && + +if [[ "${FOOT_BRANCH}" == "scm" ]]; then + depends git +fi && + +depends fontconfig && +depends freetype2 && +depends pixman && +depends tllist && + +optional_depends utf8proc \ + "run-shaping=enabled" \ + "run-shaping=disabled" \ + "for run shaping" && + +if is_depends_enabled "${SPELL}" "utf8proc"; then + optional_depends harfbuzz \ + "grapheme-shaping=enabled" \ + "grapheme-shaping=disabled" \ + "for grapheme shaping" +fi && + +optional_depends scdoc \ + "docs=enabled" \ + "docs=disabled" \ + "for documentation" diff --git a/graphics-libs/fcft/DETAILS b/graphics-libs/fcft/DETAILS new file mode 100755 index 0000000000..5f561042cb --- /dev/null +++ b/graphics-libs/fcft/DETAILS @@ -0,0 +1,38 @@ +. "${GRIMOIRE}/FUNCTIONS" +. "${GRIMOIRE}/MESON_FUNCTIONS" + SPELL="fcft" +if [[ "${FOOT_BRANCH}" == "scm" ]]; then + VERSION="$(get_scm_version)" + SOURCE="${SPELL}-git.tar.xz" + FORCE_DOWNLOAD="on" + SOURCE_URL[0]="git_http://codeberg.org/dnkl/${SPELL}:${SPELL}-git" + SOURCE_IGNORE="volatile" +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git" +else + VERSION="3.1.8" + SOURCE_HASH="sha512:1b1cfbed4e99db8e290a1dcf6c124949f5fb317e225996e63913974f4a52748a04be053cff934c8f8c0b3add22c87f9e3b1c793366431f788529e62d7a7be69c" + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]="https://codeberg.org/dnkl/${SPELL}/archive/${VERSION}.tar.gz" +# Watch: https://codeberg.org/dnkl/fcft/releases archive/([0-9.]+)[.]tar +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}" +fi + LICENSE[0]="MIT" + WEB_SITE="https://codeberg.org/dnkl/fcft" + ENTERED="20221217" + SHORT="simple library for font loading and glyph rasterization using FontConfig, FreeType and pixman" +cat << EOF +fcft is a small font loading and glyph rasterization library built on-top of +FontConfig, FreeType2 and pixman. + +It can load and cache fonts from a fontconfig-formatted name string, e.g. +Monospace:size=12, optionally with user configured fallback fonts. + +After a font has been loaded, you can rasterize glyphs. When doing so, +the primary font is first considered. If it does not have the requested glyph, +the user configured fallback fonts (if any) are considered. If none of +the user configured fallback fonts has the requested glyph, the FontConfig +generated list of fallback fonts are checked. + +The API is documented as man pages. These are built and installed when fcft is +built as a standalone project, but not when built as a subproject. +EOF diff --git a/graphics-libs/fcft/HISTORY b/graphics-libs/fcft/HISTORY new file mode 100644 index 0000000000..2c02a1518f --- /dev/null +++ b/graphics-libs/fcft/HISTORY @@ -0,0 +1,15 @@ +2024-02-26 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.1.8 + +2023-12-16 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.1.7 + +2023-07-16 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.1.6 + +2023-04-03 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: added watch line + +2022-12-17 Pavel Vinogradov <public@sourcemage.org> + * CONFIGURE, DEPENDS, DETAILS, PREPARE: created spell, version 3.1.5 + diff --git a/graphics-libs/fcft/PREPARE b/graphics-libs/fcft/PREPARE new file mode 100755 index 0000000000..e38d86f7e9 --- /dev/null +++ b/graphics-libs/fcft/PREPARE @@ -0,0 +1,2 @@ +. "${GRIMOIRE}/FUNCTIONS" && +prepare_select_branch stable scm diff --git a/graphics-libs/freeglut/DETAILS b/graphics-libs/freeglut/DETAILS index f332917edd..b4c24de356 100755 --- a/graphics-libs/freeglut/DETAILS +++ b/graphics-libs/freeglut/DETAILS @@ -1,3 +1,4 @@ +# Watch: https://freeglut.sourceforge.net/ source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=freeglut VERSION=3.4.0 diff --git a/graphics-libs/freetype2/0001-fix-make-detection.patch b/graphics-libs/freetype2/0001-fix-make-detection.patch deleted file mode 100644 index f1c46099fe..0000000000 --- a/graphics-libs/freetype2/0001-fix-make-detection.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4d2aa2467ba081b77312e39fbf24df453003bf0 Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <bwlf@bandrate.org> -Date: Sat, 24 Oct 2020 16:13:39 +0200 -Subject: [PATCH] fix make detection - ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 63ce1b9..4c7f597 100755 ---- a/configure -+++ b/configure -@@ -18,7 +18,7 @@ rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk - # respect GNUMAKE environment variable for backward compatibility - if test "x$GNUMAKE" = x; then - if test "x$MAKE" = x; then -- if test "x`make -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then -+ if test "x`make -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then - MAKE=gmake - else - MAKE=make -@@ -30,7 +30,7 @@ fi - - echo $MAKE - --if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then -+if test "x`$MAKE -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then - echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2 - echo "Please try" >&2 - echo >&2 --- -2.29.0 - diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS index 4afcbe38ef..a06681debd 100755 --- a/graphics-libs/freetype2/DEPENDS +++ b/graphics-libs/freetype2/DEPENDS @@ -16,8 +16,7 @@ if spell_ok ${SPELL}; then # LDFLAGS are taken from /usr/lib/libharfbuzz.la if is_depends_enabled $SPELL harfbuzz; then if is_depends_enabled harfbuzz glib2; then - depends glib2 && - depends pcre + depends glib2 fi fi else diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS index defe7e9134..154271a595 100755 --- a/graphics-libs/freetype2/DETAILS +++ b/graphics-libs/freetype2/DETAILS @@ -1,11 +1,12 @@ SPELL=freetype2 - VERSION=2.12.1 + VERSION=2.13.2 SECURITY_PATCH=12 SOURCE=freetype-$VERSION.tar.xz SOURCE2=$SOURCE.sig SOURCE_DIRECTORY="$BUILD_DIRECTORY/freetype-$VERSION" SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/freetype/$SOURCE SOURCE_URL[1]=https://download.savannah.gnu.org/releases/freetype/$SOURCE +# Watch: https://sourceforge.net/projects/freetype/files/freetype2/ a href="/projects/freetype/files/freetype2/([0-9.]+)/" SOURCE2_URL[0]=$SOURCE_URL.sig SOURCE2_IGNORE=signature SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY index dc234a532a..2e9a0c4f75 100644 --- a/graphics-libs/freetype2/HISTORY +++ b/graphics-libs/freetype2/HISTORY @@ -1,3 +1,16 @@ +2023-08-25 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 2.13.2 + +2023-06-24 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 2.13.1 + +2023-02-09 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 2.13.0 + * PRE_BUILD, 0001-fix-make-detection.patch: dropped, no need anymore + +2023-01-15 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: drop pcre + 2022-05-01 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 2.12.1 * DEPENDS: added optional dependency on librsvg2 diff --git a/graphics-libs/freetype2/PRE_BUILD b/graphics-libs/freetype2/PRE_BUILD deleted file mode 100755 index 4bf0403325..0000000000 --- a/graphics-libs/freetype2/PRE_BUILD +++ /dev/null @@ -1,5 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -patch -p1 < "$SPELL_DIRECTORY/0001-fix-make-detection.patch" - diff --git a/graphics-libs/ftgl/BUILD b/graphics-libs/ftgl/BUILD deleted file mode 100755 index 24627a3bd5..0000000000 --- a/graphics-libs/ftgl/BUILD +++ /dev/null @@ -1,3 +0,0 @@ -OPTS+=" --with-gl-inc=/usr/include" && -LIBS+=" -lm -lGL -lGLU" && -default_build diff --git a/graphics-libs/ftgl/CONFIGURE b/graphics-libs/ftgl/CONFIGURE new file mode 100755 index 0000000000..b2f02c3032 --- /dev/null +++ b/graphics-libs/ftgl/CONFIGURE @@ -0,0 +1 @@ +source $GRIMOIRE/CMAKE_CONFIGURE diff --git a/graphics-libs/ftgl/DEPENDS b/graphics-libs/ftgl/DEPENDS index 46b8ea24bf..7e35864ddb 100755 --- a/graphics-libs/ftgl/DEPENDS +++ b/graphics-libs/ftgl/DEPENDS @@ -1,14 +1,9 @@ +source $GRIMOIRE/CMAKE_DEPENDS depends bzip2 && depends -sub CXX gcc && depends freetype2 && depends libxext && depends zlib && -optional_depends doxygen \ - '' ac_cv_path_DOXYGEN=no \ - 'to build API documentation (HTML)' && -optional_depends texlive \ - '' ac_cv_path_LATEX=no \ - 'to build documentation (PDFs)' && -optional_depends GLUT \ - '' ac_cv_header_GL_glut_h=no \ - 'to build a demo program' +optional_depends doxygen '' '' 'build API documentation (HTML)' && +optional_depends texlive '' '' 'build documentation (PDFs)' && +optional_depends GLUT '' '' 'build a demo program' diff --git a/graphics-libs/ftgl/DETAILS b/graphics-libs/ftgl/DETAILS index 9c4f4f58e8..3f16e99356 100755 --- a/graphics-libs/ftgl/DETAILS +++ b/graphics-libs/ftgl/DETAILS @@ -1,10 +1,11 @@ +source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=ftgl - VERSION=2.1.3-rc5 + VERSION=2.4.0 + SOURCE_HASH=sha512:5a0d05dbb32952e5aa81d2537d604192ca19710cd57289ae056acc5e3ae6d403d7f0ffc8cf6c1aada6c3c23a8df4a8d0eabb81433036ade810bca1894fdfde54 SOURCE=$SPELL-$VERSION.tar.gz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/-rc5/~rc5} - SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/FTGL%20Source/${VERSION/-/%7E}/${SOURCE} - WEB_SITE=http://ftgl.wiki.sourceforge.net/ - SOURCE_HASH=sha512:77518c4546b53662b45a5c9af2418697b1a4a6250316c1e11ee71ccffc58ce03d5f19c901021b0e1cd05fec8444c84197e4bef77c662513dd6da8c29800cc3cd +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION} + WEB_SITE=https://github.com/frankheckenbach/ftgl + SOURCE_URL[0]=$WEB_SITE/archive/refs/tags/v$VERSION.tar.gz LICENSE[0]=GPL ENTERED=20040709 KEYWORDS="opengl fonts graphics libs" diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY index befadd24f2..01eb22a2b6 100644 --- a/graphics-libs/ftgl/HISTORY +++ b/graphics-libs/ftgl/HISTORY @@ -1,3 +1,10 @@ +2024-01-19 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.4.0 + new url + * PRE_BUILD: fix cmake syntax + * *: use cmake + * BUILD: deleted + 2021-12-30 Ismael Luceno <ismael@sourcemage.org> * PRE_BUILD: Fixed build against musl * DEPENDS: added optional dependency on doxyen diff --git a/graphics-libs/ftgl/PRE_BUILD b/graphics-libs/ftgl/PRE_BUILD index 3b26f4c5e7..73aeecd6b5 100755 --- a/graphics-libs/ftgl/PRE_BUILD +++ b/graphics-libs/ftgl/PRE_BUILD @@ -1,3 +1,4 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -sedit 's!maybe_os in$!& linux-musl*|\\!' .auto/config.sub +sed -i 's/2.8/3.16/;s|${PROJECT_SOURCE_DIR}/||' CMakeLists.txt && +sed -i "/.h$/D" src/CMakeLists.txt diff --git a/graphics-libs/gegl/DETAILS b/graphics-libs/gegl/DETAILS index d58457fd2d..fd632bc346 100755 --- a/graphics-libs/gegl/DETAILS +++ b/graphics-libs/gegl/DETAILS @@ -1,8 +1,9 @@ +# Watch: https://download.gimp.org/pub/gegl/0.4/ . "${GRIMOIRE}/MESON_FUNCTIONS" SPELL=gegl - VERSION=0.4.34 + VERSION=0.4.44 SOURCE=$SPELL-$VERSION.tar.xz - SOURCE_HASH=sha512:13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e + SOURCE_HASH=sha512:4dd3fad0c5e391fc1ac3784d4365ffdc483d37b90a24a29eaa632dd337971674999b2e0f8facf255d86852a3899cc51f4d27f9875ab5849f8b38d9ed5bb7413a SOURCE_URL[0]=https://download.gimp.org/pub/$SPELL/${VERSION%.*}/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://gegl.org/ diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY index daab764720..ce5390d234 100644 --- a/graphics-libs/gegl/HISTORY +++ b/graphics-libs/gegl/HISTORY @@ -1,3 +1,6 @@ +2023-06-08 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.4.44 + 2022-05-28 Florian Franzmann <bwlf@bandrate.org> * DEPENDS: use MESON_DEPENDS diff --git a/graphics-libs/giflib5/DEPENDS b/graphics-libs/giflib5/DEPENDS index 5b466eb70a..3a8494467e 100755 --- a/graphics-libs/giflib5/DEPENDS +++ b/graphics-libs/giflib5/DEPENDS @@ -1 +1,4 @@ -optional_depends xmlto "" "" "for html documentation" +optional_depends xmlto "" "" "for html documentation" && +if is_depends_enabled "${SPELL}" "xmlto"; then + depends immagemagick +fi diff --git a/graphics-libs/giflib5/DETAILS b/graphics-libs/giflib5/DETAILS index 8c3be96f16..60fa0551c2 100755 --- a/graphics-libs/giflib5/DETAILS +++ b/graphics-libs/giflib5/DETAILS @@ -1,11 +1,12 @@ SPELL=giflib5 SPELLX=${SPELL//5} - VERSION=5.2.1 - SOURCE_HASH=sha512:4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 + VERSION=5.2.2 + SOURCE_HASH=sha512:0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f SECURITY_PATCH=2 SOURCE="${SPELLX}-${VERSION}.tar.gz" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}" SOURCE_URL[0]="https://downloads.sourceforge.net/${SPELLX}/${SOURCE}" +# Watch: https://sourceforge.net/projects/giflib/files/ giflib-([0-9.]+)[.]tar LICENSE[0]=MIT WEB_SITE="http://giflib.sourceforge.net/" KEYWORDS="images graphics libs" diff --git a/graphics-libs/giflib5/HISTORY b/graphics-libs/giflib5/HISTORY index 5cec34d681..aaec3de104 100644 --- a/graphics-libs/giflib5/HISTORY +++ b/graphics-libs/giflib5/HISTORY @@ -1,5 +1,11 @@ +2024-02-20 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 5.2.2, added Watch line, quoting++ + * DEPENDS: needs imagemagick to generate documentation + * PRE_BUILD: added fix for soname missing argument issue + * patches/nodocs.patch: updated + 2022-06-19 Florian Franzmann <bwlf@bandrate.org> - * PROVIDES: fix provides line + * PROVIDES: fix provides line 2019-06-24 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 5.2.1 diff --git a/graphics-libs/giflib5/PRE_BUILD b/graphics-libs/giflib5/PRE_BUILD index f09d2b6610..300aaf7668 100755 --- a/graphics-libs/giflib5/PRE_BUILD +++ b/graphics-libs/giflib5/PRE_BUILD @@ -8,4 +8,5 @@ fi && sed -e "/OFLAGS =/s|= .*$|= ${CFLAGS}|" \ -e "/LDFLAGS =/s|= .*$|= ${LDFLAGS}|" \ -e "/PREFIX/s|/local||" \ + -e "s|soname -Wl,|soname |" \ -i Makefile diff --git a/graphics-libs/giflib5/patches/nodocs.patch b/graphics-libs/giflib5/patches/nodocs.patch index 505e307a3a..f2cde47941 100644 --- a/graphics-libs/giflib5/patches/nodocs.patch +++ b/graphics-libs/giflib5/patches/nodocs.patch @@ -1,11 +1,14 @@ diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile -@@ -63,7 +63,6 @@ - LDLIBS=libgif.a -lm +@@ -88,10 +88,6 @@ LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) + endif - all: libgif.so libgif.a libutil.so libutil.a $(UTILS) + all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS) +-ifeq ($(UNAME), Darwin) +-else - $(MAKE) -C doc +-endif $(UTILS):: libgif.a libutil.a diff --git a/graphics-libs/glfw/BUILD b/graphics-libs/glfw/BUILD index 25bc7e1930..a41b6400c8 100755 --- a/graphics-libs/glfw/BUILD +++ b/graphics-libs/glfw/BUILD @@ -1,6 +1,7 @@ +. "$GRIMOIRE/CMAKE_FUNCTIONS" && + OPTS="-DBUILD_SHARED_LIBS=ON \ -DGLFW_BUILD_EXAMPLES=OFF \ - -DGLFW_BUILD_TESTS=OFF \ ${OPTS}" && -cmake_build +default_build diff --git a/graphics-libs/glfw/CONFIGURE b/graphics-libs/glfw/CONFIGURE new file mode 100755 index 0000000000..4d164101e3 --- /dev/null +++ b/graphics-libs/glfw/CONFIGURE @@ -0,0 +1,7 @@ +. "$GRIMOIRE/CMAKE_CONFIGURE" + +config_query GLFW_SUPPORT_OPENGL 'Build support for OpenGL?' y && +config_query GLFW_SUPPORT_OSMESA 'Build support for Mesa off-screen rendering?' y && +config_query GLFW_SUPPORT_VULKAN 'Build support for Vulkan?' y && +config_query GLFW_SUPPORT_WAYLAND 'Build support for Wayland windowing?' y && +config_query GLFW_SUPPORT_X11 'Build support for Xwindows windowing?' y diff --git a/graphics-libs/glfw/DEPENDS b/graphics-libs/glfw/DEPENDS index ffab8f0fa8..5a56ee1dce 100755 --- a/graphics-libs/glfw/DEPENDS +++ b/graphics-libs/glfw/DEPENDS @@ -1,12 +1,34 @@ -depends cmake && -depends libx11 && -depends libxinerama && -depends libxrandr && -depends libxxf86vm && -depends libxcursor && -depends OPENGL && - -optional_depends doxygen \ - "-DGLFW_BUILD_DOCS=ON" \ - "-DGLFW_BUILD_DOCS=OFF" \ - "to build documentation" +. "$GRIMOIRE/CMAKE_DEPENDS" && +. "$GRIMOIRE/build_system_handler.function" && + +# needed to handle input +buildsys_depends libxkbcommon && + +if [ x"$GLFW_SUPPORT_X11"x = x'y'x ] ;then + buildsys_depends libxcb && + buildsys_depends libxinerama && + buildsys_depends libxrandr && + buildsys_depends libxxf86vm && + buildsys_depends libxcursor +fi && + +if [ x"$GLFW_SUPPORT_OSMESA"x = x'y'x ] ;then + buildsys_depends mesa -o GLFW_USE_OSMESA +fi && + +if [ x"$GLFW_SUPPORT_WAYLAND"x = x'y'x ] ;then + buildsys_depends extra-cmake-modules && + buildsys_depends wayland -o GLFW_USE_WAYLAND +fi && + +if [ x"$GLFW_SUPPORT_OPENGL "x = x'y'x ] ;then + buildsys_depends OPENGL +fi && + +if [ x"$GLFW_SUPPORT_VULKAN "x = x'y'x ] ;then + buildsys_depends vulkan-headers +fi && + +buildsys_optional_depends doxygen \ + -o GLFW_BUILD_DOCS \ + "to build documentation" diff --git a/graphics-libs/glfw/DETAILS b/graphics-libs/glfw/DETAILS index 3c703e3095..b526ceed4c 100755 --- a/graphics-libs/glfw/DETAILS +++ b/graphics-libs/glfw/DETAILS @@ -1,19 +1,20 @@ - SPELL=glfw - VERSION=3.2.1 - SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_URL[0]=https://github.com/${SPELL}/${SPELL}/archive/${VERSION}.tar.gz - SOURCE_HASH=sha512:c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc -SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" - DOC_DIRS="" - WEB_SITE="http://www.glfw.org/" - LICENSE[0]=zlib - ENTERED=20150430 - SHORT="an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events" +. "$GRIMOIRE/CMAKE_FUNCTIONS" +SPELL_BUILD_SYSTEM=cmake + SPELL=glfw + VERSION=3.3.9 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=https://github.com/${SPELL}/${SPELL}/archive/${VERSION}.tar.gz + SOURCE_HASH=sha512:9fcccd650990fa88fcb6383afa90bc6c2eca7f4a4a3d4fc58fa5bd6b7995c32989bb29d2753f438984043b294244b82ba9f094426e12f3d4da4547e73bb62e3f + SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + DOC_DIRS="" + WEB_SITE="http://www.glfw.org/" + LICENSE[0]=zlib + ENTERED=20150430 + SHORT="an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events" cat << EOF -GLFW is an Open Source, multi-platform library for creating windows with -OpenGL contexts and receiving input and events. It is easy to integrate into -existing applications and does not lay claim to the main loop. +GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan +development on the desktop. It provides a simple API for creating windows, +contexts and surfaces, receiving input and events. -GLFW is written in C and has native support for Windows, OS X and many -Unix-like systems using the X Window System, such as Linux and FreeBSD. +GLFW is written in C and supports Windows, macOS, X11 and Wayland. EOF diff --git a/graphics-libs/glfw/HISTORY b/graphics-libs/glfw/HISTORY index de930ce50e..54640c3f81 100644 --- a/graphics-libs/glfw/HISTORY +++ b/graphics-libs/glfw/HISTORY @@ -1,3 +1,14 @@ +2024-02-10 Justin Boffemmyer <flux@sourcemage.org> + * DETAILS: updated spell to 3.3.9 + * CONFIGURE: new, simplify and clarify selectable options while also + covering more of the choices upstream provides + * DEPENDS: convert to buildsys_depends, add new options for Wayland, + Vulkan, etc. support + * BUILD: respect the user's choice for building tests or not, examples + break the build so they are forcefully disabled for now + * INSTALL: new, ensure that generated docs are installed if the user + enabled them + 2016-09-29 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 3.2.1; don't do useless doc-ing * DEPENDS: added missing dependencies diff --git a/graphics-libs/glfw/INSTALL b/graphics-libs/glfw/INSTALL new file mode 100755 index 0000000000..881c52ff77 --- /dev/null +++ b/graphics-libs/glfw/INSTALL @@ -0,0 +1,10 @@ +. "$GRIMOIRE/CMAKE_FUNCTIONS" + +default_install && + +case "$OPTS" in + *GLFW_BUILD_DOCS=ON*) + mkdir -p "$DOCUMENT_DIRECTORY/$SPELL" && + cp -r docs/html "$DOCUMENT_DIRECTORY/$SPELL/" + ;; +esac diff --git a/graphics-libs/glu/BUILD b/graphics-libs/glu/BUILD deleted file mode 100755 index b72f068ec6..0000000000 --- a/graphics-libs/glu/BUILD +++ /dev/null @@ -1,2 +0,0 @@ -OPT+=" --disable-static" && -default_build diff --git a/graphics-libs/glu/CONFIGURE b/graphics-libs/glu/CONFIGURE new file mode 100755 index 0000000000..ce89cbe274 --- /dev/null +++ b/graphics-libs/glu/CONFIGURE @@ -0,0 +1 @@ +. $GRIMOIRE/MESON_CONFIGURE diff --git a/graphics-libs/glu/DEPENDS b/graphics-libs/glu/DEPENDS index 78f8e94bd6..45dd4e2171 100755 --- a/graphics-libs/glu/DEPENDS +++ b/graphics-libs/glu/DEPENDS @@ -1,2 +1,4 @@ +. "${GRIMOIRE}/MESON_DEPENDS" && depends -sub CXX gcc && -depends MESA +depends libglvnd +#depends MESA diff --git a/graphics-libs/glu/DETAILS b/graphics-libs/glu/DETAILS index f62789b623..fff091a5f8 100755 --- a/graphics-libs/glu/DETAILS +++ b/graphics-libs/glu/DETAILS @@ -1,10 +1,12 @@ +# Watch: ftp://ftp.freedesktop.org/pub/mesa/glu/ +source $GRIMOIRE/MESON_FUNCTIONS SPELL=glu - VERSION=9.0.2 + VERSION=9.0.3 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL="ftp://ftp.freedesktop.org/pub/mesa/glu/$SOURCE" - SOURCE_HASH=sha512:2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64 - WEB_SITE=http://www.mesa3d.org + SOURCE_URL=https://mesa.freedesktop.org/archive/glu/$SOURCE + SOURCE_HASH=sha512:b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba + WEB_SITE=https://www.mesa3d.org ENTERED=20120901 LICENSE[0]=GPL KEYWORDS="graphics libs" diff --git a/graphics-libs/glu/HISTORY b/graphics-libs/glu/HISTORY index beb22ebcb6..2c9762330f 100644 --- a/graphics-libs/glu/HISTORY +++ b/graphics-libs/glu/HISTORY @@ -1,3 +1,10 @@ +2023-09-17 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 9.0.3 + * : convert to meson build + * BUILD: deleted + * CONFIGURE: added + * DEPENDS: add libglvnd + 2022-11-30 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 9.0.2 * BUILD: disabled static libraries diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS index c55116f75e..6cd876d384 100755 --- a/graphics-libs/harfbuzz/DEPENDS +++ b/graphics-libs/harfbuzz/DEPENDS @@ -9,7 +9,6 @@ optional_depends glib2 \ persistent_add HARFBUZZ_OPTS && if is_depends_enabled $SPELL glib2; then - depends pcre && optional_depends gobject-introspection \ "introspection=enabled" \ diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS index d923cfdc0c..9b33b7204a 100755 --- a/graphics-libs/harfbuzz/DETAILS +++ b/graphics-libs/harfbuzz/DETAILS @@ -9,11 +9,12 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" SOURCE_IGNORE=volatile FORCE_DOWNLOAD=on else - VERSION=5.3.1 - SOURCE_HASH=sha512:6b0aef2b7445f4a71c324b545414114507d8077dc186366f25140dcd3bedeee67868cfc65c0eef59ed950381a4c101a541900be4995f645377c11754b027b501 + VERSION=8.4.0 + SOURCE_HASH=sha512:9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542 SOURCE=$SPELL-$VERSION.tar.xz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" SOURCE_URL[0]=https://github.com/harfbuzz/harfbuzz/releases/download/$VERSION/$SOURCE +# Watch: https://github.com/HarfBuzz/HarfBuzz/tags tags/([0-9.]+)[.]tar fi WEB_SITE=http://www.freedesktop.org/wiki/Software/HarfBuzz ENTERED=20111217 diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY index 556796ff9d..f3456797d2 100644 --- a/graphics-libs/harfbuzz/HISTORY +++ b/graphics-libs/harfbuzz/HISTORY @@ -1,3 +1,57 @@ +2024-04-21 Pavel Vinogradov <public@sourcemage.org> + * PRE_BUILD, patches/0001-icu-75.1.patch: added to build with ICU 75.1 + +2024-03-29 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.4.0 + +2024-03-17 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.3.1, quoting++ + +2023-11-11 Pavel Vinogradov <public@sorcemage.org> + * DETAILS: version 8.3.0 + +2023-09-08 Pavel Vinogradov <public@sorcemage.org> + * DETAILS: version 8.2.0 + +2023-08-03 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.1.1 + +2023-08-01 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.1.0 + +2023-07-13 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.0.1 + +2023-07-09 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.0.0 + +2023-05-10 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.3.0 + +2023-04-27 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.2.0 + +2023-03-03 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.1.0 + +2023-02-20 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.0.1 + +2023-02-11 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.0.0 + +2023-01-16 Pavel Vinpgradov <public@sourcemage.org> + * SUB_DEPENDS: fixed syntax error from missing ;; + +2023-01-15 Treeve Jelbert <treeve@sourcemage.org> + * SUB_DEPENDS: drop pcre2 + +2022-12-25 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: drop pcre2 + +2022-12-16 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 6.0.0 + 2022-10-20 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 5.3.1 diff --git a/graphics-libs/harfbuzz/PRE_BUILD b/graphics-libs/harfbuzz/PRE_BUILD new file mode 100755 index 0000000000..f80ee7decc --- /dev/null +++ b/graphics-libs/harfbuzz/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +apply_patch_dir patches diff --git a/graphics-libs/harfbuzz/SUB_DEPENDS b/graphics-libs/harfbuzz/SUB_DEPENDS index 059297bef0..21007e0927 100755 --- a/graphics-libs/harfbuzz/SUB_DEPENDS +++ b/graphics-libs/harfbuzz/SUB_DEPENDS @@ -1,6 +1,5 @@ case $THIS_SUB_DEPENDS in - GLIB2) depends glib2 "glib=enabled gobject=enabled" && - depends pcre ;; + GLIB2) depends glib2 "glib=enabled gobject=enabled" ;; GRAPHITE2) depends graphite2 "graphite2=enabled" ;; FT) depends freetype2 "freetype=enabled" ;; ICU) depends icu "icu=enabled" ;; diff --git a/graphics-libs/harfbuzz/patches/0001-icu-75.1.patch b/graphics-libs/harfbuzz/patches/0001-icu-75.1.patch new file mode 100644 index 0000000000..e31a6753ac --- /dev/null +++ b/graphics-libs/harfbuzz/patches/0001-icu-75.1.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index fed3dc055..e99e5ccac 100644 +--- a/meson.build ++++ b/meson.build +@@ -4,7 +4,7 @@ project('harfbuzz', 'c', 'cpp', + default_options: [ + 'cpp_eh=none', # Just to support msvc, we are passing -fno-exceptions also anyway + # 'cpp_rtti=false', # Do NOT enable, wraps inherit it and ICU needs RTTI +- 'cpp_std=c++11', ++ 'cpp_std=c++17', + 'wrap_mode=nofallback', # Use --wrap-mode=default to revert, https://github.com/harfbuzz/harfbuzz/pull/2548 + ], + ) diff --git a/graphics-libs/ilmbase/CONFLICTS b/graphics-libs/ilmbase/CONFLICTS new file mode 100755 index 0000000000..f0725b8337 --- /dev/null +++ b/graphics-libs/ilmbase/CONFLICTS @@ -0,0 +1,3 @@ +# Not installing same files, but breaking spells since same headers +# are present in different location. +conflicts imath diff --git a/graphics-libs/ilmbase/HISTORY b/graphics-libs/ilmbase/HISTORY index 94a2aa82e3..a80128704f 100644 --- a/graphics-libs/ilmbase/HISTORY +++ b/graphics-libs/ilmbase/HISTORY @@ -1,5 +1,9 @@ +2023-12-15 Thomas Orgis <sobukus@sourcemage.org> + * CONFLICTS: added conflict with imath, as things break + when dependents confuse the headers + 2022-05-28 Florian Franzmann <bwlf@bandrate.org> - * BUILD: set C++ version to C++14 to avoid build error + * BUILD: set C++ version to C++14 to avoid build error 2018-01-12 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 2.2.1 diff --git a/graphics-libs/imath/CONFLICTS b/graphics-libs/imath/CONFLICTS new file mode 100755 index 0000000000..c30658fd85 --- /dev/null +++ b/graphics-libs/imath/CONFLICTS @@ -0,0 +1,2 @@ +# Not same files, but header confusion with the earlier ilmbase. +conflicts ilmbase diff --git a/graphics-libs/imath/DETAILS b/graphics-libs/imath/DETAILS index 5d1e47b1bf..e091f9b316 100755 --- a/graphics-libs/imath/DETAILS +++ b/graphics-libs/imath/DETAILS @@ -1,6 +1,7 @@ source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=imath VERSION=3.1.3 + PATCHLEVEL=1 SOURCE_HASH=sha512:a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/Imath-$VERSION diff --git a/graphics-libs/imath/HISTORY b/graphics-libs/imath/HISTORY index 0bd4664291..f33d72c8b0 100644 --- a/graphics-libs/imath/HISTORY +++ b/graphics-libs/imath/HISTORY @@ -1,3 +1,8 @@ +2023-12-15 Thomas Orgis <sobukus@sourcemage.org> + * CONFLICTS: added conflict with ilmbase, as things break + when dependents confuse the headers + * DETAILS: ++PATCHLEVEL for the above + 2021-11-15 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.1.3 spell created diff --git a/graphics-libs/jasper/DEPENDS b/graphics-libs/jasper/DEPENDS index 2619918863..35c0c613c9 100755 --- a/graphics-libs/jasper/DEPENDS +++ b/graphics-libs/jasper/DEPENDS @@ -10,6 +10,14 @@ optional_depends GLUT \ "-DJAS_ENABLE_OPENGL=false" \ "to build the jiv image display utility" && +optional_depends doxygen \ + "-DJAS_ENABLE_DOC=true" \ + "-DJAS_ENABLE_DOC=false" \ + "for documentation (pulls in texlive, too)" && +if is_depends_enabled $SPELL doxygen; then + depends texlive +fi && + local GLUT_PROVIDER=$(get_spell_provider $SPELL GLUT) && if [[ $GLUT_PROVIDER ]] then diff --git a/graphics-libs/jasper/DETAILS b/graphics-libs/jasper/DETAILS index ae1477f8c4..259dbaa61c 100755 --- a/graphics-libs/jasper/DETAILS +++ b/graphics-libs/jasper/DETAILS @@ -1,12 +1,12 @@ source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=jasper - VERSION=2.0.14 + VERSION=4.2.0 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_HASH=sha512:9e5cffd2e899e37ba08890e2377ddfc3c2fb13d9fe00dea6b4612e4d241a6f4327de6835809b415c41ae4bf44208cf7871c1982ff5fc04ae6bc09fd376b0afc8 + SOURCE_HASH=sha512:50b81dbfcdb29aaf5225dd3cc108a798191037785c9d2a1f4390dc2383321b8f29c7a249cb5e4b0ecb5945bc7952354a02e337690c88f0d346b9d59838287430 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" - SOURCE_URL[0]=https://www.ece.uvic.ca/~frodo/jasper/software/$SOURCE - WEB_SITE=http://www.ece.uvic.ca/~frodo/jasper/ - LICENSE[0]=http://www.ece.uvic.ca/~frodo/jasper/LICENSE + SOURCE_URL[0]=https://github.com/jasper-software/jasper/releases/download/version-$VERSION/$SOURCE + WEB_SITE=https://www.ece.uvic.ca/~frodo/jasper/ + LICENSE[0]=https://www.ece.uvic.ca/~frodo/jasper/LICENSE ENTERED=20040118 SECURITY_PATCH=1 KEYWORDS="images graphics libs" diff --git a/graphics-libs/jasper/HISTORY b/graphics-libs/jasper/HISTORY index fc0ada8cff..ad25024597 100644 --- a/graphics-libs/jasper/HISTORY +++ b/graphics-libs/jasper/HISTORY @@ -1,3 +1,11 @@ +2024-02-18 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.2.0 + download from github + * PRE_BUILD: added to fix build + +2023-12-13 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: handle doxygen/latex dep + 2019-10-06 Florian Franzmann <bwlf@bandrate.org> * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_* * DETAILS: version 2.0.14 diff --git a/graphics-libs/jasper/PRE_BUILD b/graphics-libs/jasper/PRE_BUILD new file mode 100755 index 0000000000..bc12e13c5d --- /dev/null +++ b/graphics-libs/jasper/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +sed -i '/InSourceBuild/D' CMakeLists.txt diff --git a/graphics-libs/libepoxy/DEPENDS b/graphics-libs/libepoxy/DEPENDS index 7de1a1bc1e..a161b1885a 100755 --- a/graphics-libs/libepoxy/DEPENDS +++ b/graphics-libs/libepoxy/DEPENDS @@ -3,5 +3,5 @@ depends PKG-CONFIG && depends OPENGL && depends python3 && -depends libx11 && +optional_depends libx11 "x11=true" "x11=false" "for X11 backend" && optional_depends doxygen 'docs=true' 'docs=false' 'create docs' diff --git a/graphics-libs/libepoxy/HISTORY b/graphics-libs/libepoxy/HISTORY index a63280f433..ff23b7cf18 100644 --- a/graphics-libs/libepoxy/HISTORY +++ b/graphics-libs/libepoxy/HISTORY @@ -1,3 +1,6 @@ +2023-02-21 Pavel Vinogradov <public@sourcemage.org> + * DEPENDS: made libx11 optional + 2022-07-27 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: switch to PKG-CONFIG provider (automated) diff --git a/graphics-libs/libglvnd/DEPENDS b/graphics-libs/libglvnd/DEPENDS index 060fa15419..b54864289a 100755 --- a/graphics-libs/libglvnd/DEPENDS +++ b/graphics-libs/libglvnd/DEPENDS @@ -6,6 +6,9 @@ fi && depends python3 && depends gcc && -depends libxext && -depends libx11 && -depends xorgproto + +optional_depends libx11 "x11=enabled" "x11=disabled" "for X11 support" && +if is_depends_enabled "${SPELL}" "libx11"; then + depends libxext && + depends xorgproto +fi diff --git a/graphics-libs/libglvnd/DETAILS b/graphics-libs/libglvnd/DETAILS index 7efb9e7cfb..a630e3c619 100755 --- a/graphics-libs/libglvnd/DETAILS +++ b/graphics-libs/libglvnd/DETAILS @@ -9,10 +9,11 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm" SOURCE_IGNORE="volatile" FORCE_DOWNLOAD="on" else - VERSION=1.6.0 - SOURCE_HASH=sha512:fa96077a4b0bc9ca01924f84f3dc534c316ab8d1b55fc1547086a5d0527acfc1f972282f75c9df8fa42584c3feffda2e535f4950fcda0cc5f1cc40bc26e854c2 + VERSION=1.7.0 + SOURCE_HASH=sha512:793dc1fbbcd6161a9f82aa1640eb633de17c8c9fcbdbe4b1e68907a07024e45ae952dda32fc3c4ca9c445e4751aa67246414bc48c9fac9a8570146b21e86159c SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=https://github.com/NVIDIA/${SPELL}/archive/v${VERSION}.tar.gz +# Watch: https://github.com/NVIDIA/libglvnd/tags tags/v([0-9.]+)[.]tar SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" fi WEB_SITE="https://github.com/NVIDIA/libglvnd" diff --git a/graphics-libs/libglvnd/HISTORY b/graphics-libs/libglvnd/HISTORY index 7087ade767..4d7e59cce0 100644 --- a/graphics-libs/libglvnd/HISTORY +++ b/graphics-libs/libglvnd/HISTORY @@ -1,3 +1,12 @@ +2024-02-14 Pavel Vinogradov <public@sourcemage.org> + * INSTALL: added to create symlink gl.pc -> opengl.pc + +2023-09-13 Pavel Vinogradov <public@sorcemage.org> + * DETAILS: version 1.7.0, added Watch line + +2023-02-23 Pavel Vinogradov <public@sourcemage.org> + * DEPENDS: libx11, libxext and xorgproto are optonal now + 2022-11-23 Pavel Vinogradov <public@sourcemage.org> * DEPENDS, DETAILS, PREPARE: added scm branch diff --git a/graphics-libs/libglvnd/INSTALL b/graphics-libs/libglvnd/INSTALL new file mode 100755 index 0000000000..b1a02ad927 --- /dev/null +++ b/graphics-libs/libglvnd/INSTALL @@ -0,0 +1,3 @@ +default_install && + +ln -sf "opengl.pc" "${INSTALL_ROOT}/usr/lib/pkgconfig/gl.pc" diff --git a/graphics-libs/libjpeg-turbo/CONFIGURE b/graphics-libs/libjpeg-turbo/CONFIGURE index b2f02c3032..90942b1d59 100755 --- a/graphics-libs/libjpeg-turbo/CONFIGURE +++ b/graphics-libs/libjpeg-turbo/CONFIGURE @@ -1 +1 @@ -source $GRIMOIRE/CMAKE_CONFIGURE +. "${GRIMOIRE}/CMAKE_CONFIGURE" diff --git a/graphics-libs/libjpeg-turbo/DEPENDS b/graphics-libs/libjpeg-turbo/DEPENDS index 93feff81f1..4e5065f953 100755 --- a/graphics-libs/libjpeg-turbo/DEPENDS +++ b/graphics-libs/libjpeg-turbo/DEPENDS @@ -1,2 +1,2 @@ -source $GRIMOIRE/CMAKE_DEPENDS +. "${GRIMOIRE}/CMAKE_DEPENDS" && depends X86-ASSEMBLER diff --git a/graphics-libs/libjpeg-turbo/DETAILS b/graphics-libs/libjpeg-turbo/DETAILS index 2eac18b9eb..ab3e320eec 100755 --- a/graphics-libs/libjpeg-turbo/DETAILS +++ b/graphics-libs/libjpeg-turbo/DETAILS @@ -1,11 +1,12 @@ -source $GRIMOIRE/CMAKE_FUNCTIONS +. "${GRIMOIRE}/CMAKE_FUNCTIONS" SPELL=libjpeg-turbo - VERSION=2.1.4 - SOURCE_HASH=sha512:511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70 + VERSION=3.0.2 + SOURCE_HASH=sha512:9dddc039d9fd43fe2e2ff6a8b14fab4344f778ff270ec6f38f6496846501701df10b5127e2fe8b778cc236cac38b73889b9cc5bf884f8a43c37c4736097abb25 SECURITY_PATCH=4 SOURCE=$SPELL-$VERSION.tar.gz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + SOURCE_URL[0]="https://github.com/${SPELL}/${SPELL}/archive/${VERSION}.tar.gz" +# Watch: https://github.com/libjpeg-turbo/libjpeg-turbo/tags tags/([0-9.]+)[.]tar WEB_SITE=https://libjpeg-turbo.org ENTERED=20101103 LICENSE[0]=WXWINDOWS diff --git a/graphics-libs/libjpeg-turbo/HISTORY b/graphics-libs/libjpeg-turbo/HISTORY index a23bddb9c0..558a2802d9 100644 --- a/graphics-libs/libjpeg-turbo/HISTORY +++ b/graphics-libs/libjpeg-turbo/HISTORY @@ -1,3 +1,16 @@ +2024-01-24 Pavel Vinogradov <public@sourcemage.org> + * CONFIGURE, DEPENDS, DETAILS: version 3.0.2, quoting++, download from + GitHub now + +2023-10-17 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.0.1 + +2023-07-03 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.0.0 + +2023-02-08 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 2.1.5.1 + 2022-08-12 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 2.1.4 diff --git a/graphics-libs/libmypaint/DETAILS b/graphics-libs/libmypaint/DETAILS index 1897df2a8f..e81e9bf4e2 100755 --- a/graphics-libs/libmypaint/DETAILS +++ b/graphics-libs/libmypaint/DETAILS @@ -1,8 +1,8 @@ SPELL=libmypaint - VERSION=1.5.0 + VERSION=1.6.1 SOURCE="$SPELL-$VERSION.tar.xz" SOURCE_URL[0]=https://github.com/mypaint/libmypaint/releases/download/v$VERSION/$SOURCE - SOURCE_HASH=sha512:ebc08bbdc033013212f31ce672ff015a33df838154f9244df3c9ed4a30696bbad7630081c35c616153db1303692794116aec51b644a6558cd030016f4f470a7b + SOURCE_HASH=sha512:e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION" WEB_SITE="https://github.com/mypaint/libmypaint" LICENSE[0]=ISC diff --git a/graphics-libs/libmypaint/HISTORY b/graphics-libs/libmypaint/HISTORY index a9bc49ab97..dcde844f68 100644 --- a/graphics-libs/libmypaint/HISTORY +++ b/graphics-libs/libmypaint/HISTORY @@ -1,3 +1,6 @@ +2023-12-07 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: version 1.6.1 + 2020-02-11 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 1.5.0 * PRE_BUILD, libmypaint-1.3.0-gegl-0.4.14.patch: removed diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS index c243c7a9a6..3cc9a08ce2 100755 --- a/graphics-libs/libpng/DETAILS +++ b/graphics-libs/libpng/DETAILS @@ -1,11 +1,12 @@ SPELL=libpng - VERSION=1.6.39 - SOURCE_HASH=sha512:ce233bb58d70b391b7dc858a132a8f9f66a9e30f5b387426317fdd5e76e8395e00ec36324e5e2caec8fda49a3f2b13fe27594a3466fdf2020ec7520e79a608c9 + VERSION=1.6.43 + SOURCE_HASH=sha512:c95d661fed548708ce7de5d80621a432272bdfe991f0d4db3695036e5fafb8a717b4e4314991bdd3227d7aa07f8c6afb6037c57fa0fe3349334a0b6c58268487 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_URL[0]=https://downloads.sourceforge.net/project/${SPELL}/${SPELL}16/${VERSION}/${SOURCE} +# Watch: https://sourceforge.net/projects/libpng/files/libpng16/ a href="/projects/libpng/files/libpng16/([0-9.]+)/" if [[ $ANI_PNG == y ]]; then - SOURCE3=$SPELL-$VERSION-apng.patch.gz - SOURCE3_HASH=sha512:97a182da0b3b54aecf735e3655d8e8f1a569ae957b23fc3d7a9c8cc65dcdd26f34f173ce9f60af99b01d5347267b2afefaf787c500ce1005e86bf2810b3d0738 + SOURCE3=$SPELL-${VERSION}-apng.patch.gz + SOURCE3_HASH=sha512:a724f7de486920cb119818f7172fb589bc2c3c1cc1f81bb5c4da0609ab108ef9ef7406cf689a20bc4e8da69647847f550ed497b3fa99a10539e9a0abf492c053 SOURCE3_URL[0]=https://downloads.sourceforge.net/project/${SPELL}-apng/${SPELL}16/${VERSION}/${SOURCE3} fi SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY index e61af7978c..646922b87d 100644 --- a/graphics-libs/libpng/HISTORY +++ b/graphics-libs/libpng/HISTORY @@ -1,3 +1,13 @@ +2024-02-24 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 1.6.43, APNG patch same version + * PRE_BUILD: unpack_file -> verify_file + +2024-01-31 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 1.6.42, APNG patch version 1.6.40 + +2023-06-22 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 1.6.40, APNG patch version 1.6.39 + 2022-11-26 Pavel Vinogradov <public@sourcemage.org> * DETAILS: APNG patch version 1.6.39 diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD index 71b98189d1..eeafdfd80a 100755 --- a/graphics-libs/libpng/PRE_BUILD +++ b/graphics-libs/libpng/PRE_BUILD @@ -4,6 +4,6 @@ cd "$SOURCE_DIRECTORY" && sedit '/^[\t ]*func_show_eval "[$]install_prog [$]instname /d' ltmain.sh && if [[ $ANI_PNG == y ]]; then - unpack_file 3 && + verify_file 3 && zcat "$SOURCE_CACHE/$SOURCE3" | patch -p1 fi diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS index f33c454a35..629587a243 100755 --- a/graphics-libs/libraw/DETAILS +++ b/graphics-libs/libraw/DETAILS @@ -1,9 +1,9 @@ SPELL=libraw SPELLX=LibRaw - VERSION=0.20.2 + VERSION=0.21.1 DPACK=0.18.8 SECURITY_PATCH=4 - SOURCE_HASH=sha512:96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a + SOURCE_HASH=sha512:8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d SOURCE2_HASH=sha512:c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d SOURCE3_HASH=sha512:10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500 SOURCE=$SPELLX-$VERSION.tar.gz diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY index abc7bd9f80..def8db6121 100644 --- a/graphics-libs/libraw/HISTORY +++ b/graphics-libs/libraw/HISTORY @@ -1,3 +1,9 @@ +2023-01-07 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 0.21.1 + +2022-12-23 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 0.21.0 + 2020-10-19 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 0.20.2 diff --git a/graphics-libs/libspectre/DETAILS b/graphics-libs/libspectre/DETAILS index c911544c81..703bb555f4 100755 --- a/graphics-libs/libspectre/DETAILS +++ b/graphics-libs/libspectre/DETAILS @@ -1,5 +1,5 @@ SPELL=libspectre - VERSION=0.2.10 + VERSION=0.2.12 PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/graphics-libs/libspectre/HISTORY b/graphics-libs/libspectre/HISTORY index 9ec0bf5e9b..0ef67b9563 100644 --- a/graphics-libs/libspectre/HISTORY +++ b/graphics-libs/libspectre/HISTORY @@ -1,3 +1,6 @@ +2023-12-24 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.2.12 + 2022-07-27 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: switch to PKG-CONFIG provider (automated) diff --git a/graphics-libs/libwacom/DETAILS b/graphics-libs/libwacom/DETAILS index fef114c7fd..82ff86d5cf 100755 --- a/graphics-libs/libwacom/DETAILS +++ b/graphics-libs/libwacom/DETAILS @@ -1,10 +1,11 @@ +# Watch: https://github.com/linuxwacom/libwacom/releases/ . "$GRIMOIRE"/MESON_FUNCTIONS SPELL=libwacom - VERSION=2.2.0 + VERSION=2.10.0 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=https://github.com/linuxwacom/$SPELL/releases/download/$SPELL-$VERSION/$SOURCE - SOURCE_HASH=sha512:3bded4a72bec230f3318e72bdfd81fa577d4a86103a89367e01e993319f4dbb9ccc73c834c04d5a63f43a8b94457bf64e567d7e3f8d2a0e08b189300c63782a8 + SOURCE_HASH=sha512:dc62db42596e14ace8463bc6bb115503d55f14c23a2a259b2169746e21b25eeeaacc09d7d1dd85c3e05f6dc5f3d96a3c757b2c93b171673e8f869337408495f9 LICENSE[0]=GPL WEB_SITE=https://linuxwacom.github.io/ ENTERED=20120328 diff --git a/graphics-libs/libwacom/HISTORY b/graphics-libs/libwacom/HISTORY index 3949e1c0dd..48586153eb 100644 --- a/graphics-libs/libwacom/HISTORY +++ b/graphics-libs/libwacom/HISTORY @@ -1,3 +1,6 @@ +2024-04-05 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 2.10.0 + 2022-04-13 Ismael Luceno <ismael@sourcemage.org> * PRE_BUILD: removed, no longer needed * BUILD, CONFIGURE, DEPENDS, DETAILS: updated spell to 2.2.0 diff --git a/graphics-libs/libwebp/DETAILS b/graphics-libs/libwebp/DETAILS index 15d3022cb0..2a8d62eb29 100755 --- a/graphics-libs/libwebp/DETAILS +++ b/graphics-libs/libwebp/DETAILS @@ -1,13 +1,12 @@ SPELL=libwebp - VERSION=1.2.4 - SECURITY_PATCH=1 + VERSION=1.3.2 + SECURITY_PATCH=3 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://downloads.webmproject.org/releases/webp/$SOURCE SOURCE2=$SOURCE.asc SOURCE2_URL[0]=${SOURCE_URL[0]}.asc SOURCE_GPG=webp.gpg:$SOURCE2:UPSTREAM_KEY - SOURCE2_HASH=sha512:01f21e2c3057f5878b33664d0070832d78420de3cb2fe4379b07ae6a27bb569fd1c27a920fe324beccb96ae7bfa8c05fdd9e7b0aeba6de06ab4d8b084bb38803 WEB_SITE=https://developers.google.com/speed/webp/ ENTERED=20121124 LICENSE[0]=GOOGLE diff --git a/graphics-libs/libwebp/HISTORY b/graphics-libs/libwebp/HISTORY index c489f40c6f..930af780a0 100644 --- a/graphics-libs/libwebp/HISTORY +++ b/graphics-libs/libwebp/HISTORY @@ -1,3 +1,19 @@ +2023-09-23 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.3.2 + * PRE_BUILD, patches/CVE-2023-4863.patch: deleted + +2023-09-13 Pavel Vinogradov <public@sorcemage.org> + * DETAILS: SECURITY_PATCH++, (CVE-2023-4863) + * PRE_BUILD, patches/CVE-2023-4863.patch: added slightly modified security + patch from Mozilla + +2023-07-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.3.1 + SECURITY_PATCH++ fixes CVE-2023-1999 + +2023-04-05 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.3.0 + 2022-08-26 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 1.2.4 diff --git a/graphics-libs/libwmf/DETAILS b/graphics-libs/libwmf/DETAILS index 123d8bced7..9c74d4eb67 100755 --- a/graphics-libs/libwmf/DETAILS +++ b/graphics-libs/libwmf/DETAILS @@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION KEYWORDS="images graphics libs" SHORT="libwmf is a library for reading wmf vector images" cat << EOF -libwmf is a library for reading vector images in Microsøft's native Windøws +libwmf is a library for reading vector images in Microsoft's native Windøws Metafile Format (WMF) and for either (a) displaying them in, e.g., an X window; or (b) converting them to more standard/open file formats such as, e.g., the W3C's XML-based Scaleable Vector Graphic (SVG) format. Currently bindings exist diff --git a/graphics-libs/libxmi/DETAILS b/graphics-libs/libxmi/DETAILS index da19f29d7e..4e120f6e19 100755 --- a/graphics-libs/libxmi/DETAILS +++ b/graphics-libs/libxmi/DETAILS @@ -1,3 +1,4 @@ +# Watch: https://ftp.gnu.org/gnu/libxmi SPELL=libxmi VERSION=1.2 SOURCE=$SPELL-$VERSION.tar.gz diff --git a/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch b/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch index 70913b38e9..bf874a1c67 100644 --- a/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch +++ b/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch @@ -1,20 +1,19 @@ -From cbdb123158b7e115c9c767104bb2793a10d95151 Mon Sep 17 00:00:00 2001 +From 5ddf5e9f399ba1bb8e3fcac1fc3adce63d89102d Mon Sep 17 00:00:00 2001 From: Florian Franzmann <bwlf@bandrate.org> -Date: Sun, 9 May 2021 14:36:52 +0200 -Subject: [PATCH] Install GL headers in .mesa install libGL to lib/.mesa +Date: Fri, 9 Jun 2023 09:54:37 +0200 +Subject: [PATCH] Install to the right paths --- - include/meson.build | 8 ++++---- - src/egl/meson.build | 1 + - src/glx/meson.build | 1 + - src/mapi/es2api/meson.build | 1 + - 4 files changed, 7 insertions(+), 4 deletions(-) + include/meson.build | 8 ++++---- + src/egl/meson.build | 1 + + src/glx/meson.build | 1 + + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/meson.build b/include/meson.build -index 4ee415f..7aa2487 100644 +index c55325d..44a0118 100644 --- a/include/meson.build +++ b/include/meson.build -@@ -66,7 +66,7 @@ if not with_glvnd +@@ -65,7 +65,7 @@ if not with_glvnd 'GL/gl.h', 'GL/glcorearb.h', 'GL/glext.h', @@ -23,7 +22,7 @@ index 4ee415f..7aa2487 100644 ) endif -@@ -74,7 +74,7 @@ if not with_glvnd +@@ -73,7 +73,7 @@ if not with_glvnd install_headers( 'GL/glx.h', 'GL/glxext.h', @@ -32,7 +31,7 @@ index 4ee415f..7aa2487 100644 endif if with_egl -@@ -97,11 +97,11 @@ if with_egl +@@ -96,11 +96,11 @@ if with_egl endif if with_osmesa @@ -41,27 +40,28 @@ index 4ee415f..7aa2487 100644 endif if with_dri - install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal') +- install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal') ++ install_headers('GL/internal/dri_interface.h', subdir : 'GL/.mesa/internal') endif if with_gallium_st_nine diff --git a/src/egl/meson.build b/src/egl/meson.build -index 599a667..d482a33 100644 +index ac9a48e..92e83de 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build -@@ -206,6 +206,7 @@ libegl = shared_library( +@@ -211,6 +211,7 @@ libegl = shared_library( + link_args : [ld_args_bsymbolic, ld_args_gc_sections], + dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread, idep_mesautil], + install : true, ++ install_dir : 'lib/.mesa', version : egl_lib_version, soversion : egl_lib_soversion, - name_prefix : 'lib', # even on windows -+ install_dir : 'lib/.mesa', - vs_module_defs : egl_def - ) - + name_prefix : host_machine.system() == 'windows' ? 'lib' : [], # always use lib, but avoid warnings on !windows diff --git a/src/glx/meson.build b/src/glx/meson.build -index 58f9e1a..b282e5f 100644 +index 20f0474..b8143c2 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build -@@ -159,6 +159,7 @@ libgl = shared_library( +@@ -154,6 +154,7 @@ libgl = shared_library( version : gl_lib_version, darwin_versions : '4.0.0', install : true, @@ -69,18 +69,6 @@ index 58f9e1a..b282e5f 100644 ) if with_tests -diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build -index 356c576..04f3df6 100644 ---- a/src/mapi/es2api/meson.build -+++ b/src/mapi/es2api/meson.build -@@ -52,6 +52,7 @@ libgles2 = shared_library( - darwin_versions : '3.0.0', - name_prefix : 'lib', - install : true, -+ install_dir : 'lib/.mesa', - ) - - pkg.generate( -- -2.31.1 +2.40.1 diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD index 4206e6ca90..fcaa585a5f 100755 --- a/graphics-libs/mesa/BUILD +++ b/graphics-libs/mesa/BUILD @@ -28,7 +28,11 @@ fi && local vulkan=${MESA_VULKAN//none} && local gallium=${MESA_GALLIUM//none} && -local dri=${MESA_DRI//none} && + +# for NVK +if list_find "${MESA_VULKAN}" "nouveau"; then + python3 bin/git_sha1_gen.py --output src/git_sha1.h +fi && OPTS+=" gallium-drivers=${gallium// /,} \ vulkan-drivers=${vulkan// /,} \ diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE index 8397407ed2..661ee34e16 100755 --- a/graphics-libs/mesa/CONFIGURE +++ b/graphics-libs/mesa/CONFIGURE @@ -1,46 +1,50 @@ -persistent_remove MESALIB_OPTS -persistent_remove MESALIB_VULKAN -persistent_remove MESALIB_BUILD -persistent_remove MESALIB_GALLIUM -persistent_remove MESALIB_DRIVERS -persistent_remove MESA_OSMESA +persistent_remove MESALIB_OPTS && +persistent_remove MESALIB_VULKAN && +persistent_remove MESALIB_BUILD && +persistent_remove MESALIB_GALLIUM && +persistent_remove MESALIB_DRIVERS && +persistent_remove MESA_OSMESA && persistent_remove MESA_DRI && persistent_remove MESA_ARCH && list_remove MESA_GLX "gallium-xlib" && list_remove MESA_TOOLS "xvmc" && # adjust some flags -MESA_GLES1=${MESA_GLES1/true/enabled} -MESA_GLES2=${MESA_GLES2/true/enabled} -MESA_GLES1=${MESA_GLES1/false/disabled} -MESA_GLES2=${MESA_GLES2/false/disabled} -MESA_EGL=${MESA_EGL/drm/} +MESA_GLES1=${MESA_GLES1/true/enabled} && +MESA_GLES2=${MESA_GLES2/true/enabled} && +MESA_GLES1=${MESA_GLES1/false/disabled} && +MESA_GLES2=${MESA_GLES2/false/disabled} && +MESA_EGL=${MESA_EGL/drm/} && +MESA_VULKAN=${MESA_VULKAN/\-experimental/} && -. $GRIMOIRE/config_query_multi.function && -. $GRIMOIRE/MESON_CONFIGURE && +. "${GRIMOIRE}/config_query_multi.function" && +. "${GRIMOIRE}/MESON_CONFIGURE" && config_query_multi MESA_EGL "window systems to support,recommend x11" x11 wayland && config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON && # only suggest drivers for specified hardware -local AVAILABLE_GALLIUM="svga swrast virgl zink" -local AVAILABLE_VULKAN="swrast" +local AVAILABLE_GALLIUM="svga swrast virgl zink" && +local AVAILABLE_VULKAN="swrast" && if list_find "$MESA_DRM" AMD;then - AVAILABLE_VULKAN+=" amd" + AVAILABLE_VULKAN="amd ${AVAILABLE_VULKAN}" fi && if list_find "$MESA_DRM" RADEON;then - AVAILABLE_GALLIUM+=" r300 r600 radeonsi" + AVAILABLE_GALLIUM="r300 r600 radeonsi ${AVAILABLE_GALLIUM}" fi && if list_find "$MESA_DRM" INTEL;then - AVAILABLE_GALLIUM+=" i915 iris crocus" - AVAILABLE_VULKAN+=" intel" + AVAILABLE_GALLIUM="i915 iris crocus ${AVAILABLE_GALLIUM}" && + AVAILABLE_VULKAN="intel ${AVAILABLE_VULKAN}" fi && if list_find "$MESA_DRM" NOUVEAU;then - AVAILABLE_GALLIUM+=" nouveau" + AVAILABLE_GALLIUM="nouveau ${AVAILABLE_GALLIUM}" && + AVAILABLE_VULKAN="nouveau ${AVAILABLE_VULKAN}" fi && -config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib && - +config_query_multi MESA_GLX "glx build types, recommend dri" disabled dri xlib && +if list_find "${MESA_GLX}" "disabled"; then + MESA_GLX="disabled" +fi && # Gallium support @@ -60,6 +64,7 @@ config_query_multi MESA_VULKAN \ if list_find "$MESA_VULKAN" all; then MESA_VULKAN="$AVAILABLE_VULKAN" fi && + config_query_option MESA_GLES1 "support GLES1 - embedded systems" n gles1=enabled gles1=disabled && config_query_option MESA_GLES2 "support GLES2/3 - embedded systems" n gles2=enabled gles2=disabled && @@ -72,8 +77,8 @@ config_query_multi MESA_TOOLS "which tools to build" \ nir \ nouveau && -config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio +config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio && # strip any leading spaces from the driver lists -MESA_GALLIUM="${MESA_GALLIUM# }" +MESA_GALLIUM="${MESA_GALLIUM# }" && MESA_VULKAN="${MESA_VULKAN# }" diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS index 74edd0532d..709f1fb40e 100755 --- a/graphics-libs/mesa/DEPENDS +++ b/graphics-libs/mesa/DEPENDS @@ -4,29 +4,32 @@ depends -sub "CXX" gcc && depends bison && depends flex && depends GETTEXT && +depends glslang && depends -sub "$MESA_DRM" libdrm && depends util-macros && depends expat && -depends libxdamage && -depends libx11 && -depends xorgproto && -depends libxshmfence && depends -sub "PYTHON3" mako && -depends libxrandr && depends nettle && depends zlib && -if list_find "$MESA_GALLIUM" "nouveau"; then - depends -sub RTTI llvm -fi && +local LLVM_SUB_DEPS && +if list_find "$MESA_GALLIUM" "nouveau"; then LLVM_SUB_DEPS="RTTI ${LLVM_SUB_DEPS}"; fi && if (list_find "${MESA_GALLIUM}" "radeonsi") || (list_find "$MESA_VULKAN" amd); then - depends -sub AMD llvm && + LLVM_SUB_DEPS="AMD ${LLVM_SUB_DEPS}" && depends LIBELF -else +fi && +if [[ -z "${LLVM_SUB_DEPS}" ]]; then optional_depends llvm 'llvm=enabled' 'llvm=disabled' 'LLVM support' +else + depends -sub "${LLVM_SUB_DEPS# }" llvm "llvm=enabled" +fi && + +if list_find "${MESA_VULKAN}" "nouveau"; then + depends rust && + depends rust-bindgen fi && if list_find "$MESA_GLX" dri;then @@ -35,6 +38,13 @@ if list_find "$MESA_GLX" dri;then depends libxfixes && depends libxcb fi && +if list_find "$MESA_EGL" "x11"; then + depends libxdamage && + depends libx11 && + depends xorgproto && + depends libxshmfence && + depends libxrandr +fi && if list_find "$MESA_EGL" wayland;then depends wayland && depends wayland-protocols @@ -47,7 +57,7 @@ fi && optional_depends libvdpau 'gallium-vdpau=enabled' 'gallium-vdpau=disabled' 'gallium vdpau state tracker' && optional_depends libva 'gallium-va=enabled' 'gallium-va=disabled' 'gallium va state tracker' && if is_depends_enabled "${SPELL}" libva; then - . $GRIMOIRE/config_query_multi.function && + . "${GRIMOIRE}/config_query_multi.function" && config_query_multi MESA_VA_CODECS "Would you like to enable some patented codecs?" \ none all vc1dec h264dec h264enc h265dec h265enc && MESA_VA_CODECS="${MESA_VA_CODECS# }" && diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS index 3aa4eab5ef..b4a105af40 100755 --- a/graphics-libs/mesa/DETAILS +++ b/graphics-libs/mesa/DETAILS @@ -1,5 +1,5 @@ . "${GRIMOIRE}/FUNCTIONS" -source $GRIMOIRE/MESON_FUNCTIONS +. "${GRIMOIRE}/MESON_FUNCTIONS" SPELL=mesa if [[ "${MESA_BRANCH}" == "scm" ]]; then VERSION=$(get_scm_version) @@ -9,11 +9,12 @@ if [[ "${MESA_BRANCH}" == "scm" ]]; then SOURCE_IGNORE="volatile" SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git" else - VERSION=22.3.0 - SOURCE_HASH="sha256:644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746" + VERSION="24.0.6" + SOURCE_HASH="sha256:8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604:UPSTREAM_HASH" SOURCE=mesa-$VERSION.tar.xz +# Watch: https://archive.mesa3d.org/ mesa-([0-9.]+)[.]tar SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}" -SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesa-${VERSION} +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mesa-${VERSION}" fi LICENSE[0]=GPL WEB_SITE=https://www.mesa3d.org/ diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY index 36926e3831..3686701fae 100644 --- a/graphics-libs/mesa/HISTORY +++ b/graphics-libs/mesa/HISTORY @@ -1,3 +1,124 @@ +2024-04-24 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.6 + +2024-04-12 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.5 + +2024-04-01 Pavel Vinogradov <public@sourcemage.org> + * BUILD, CONFIGURE, DEPENDS: nouveau-experimental -> nouveau in MESA_VULKAN, + added missing &&, fixed generation of git_sha1.h for NVK, removed message + about experimental status of NVK + +2024-03-29 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.4 + +2024-03-14 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.3 + +2024-02-29 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.2 + +2024-02-15 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.1 + +2024-02-01 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 24.0.0 + +2024-01-30 Pavel Vinogradov <public@sourcemage.org> + * CONFIGURE, DEPENDS: added nouveau vulkan driver which needs rust, + quoting++, removed += + +2024-01-24 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.3.4 + +2024-01-23 Ismael Luceno <ismael@sourcemage.org> + * SUB_DEPENDS: fixed GLES2 subdep + +2024-01-11 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: actual version 23.3.3, quoting++ + +2024-01-10 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.3.3 + +2023-12-27 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.3.2 + +2023-12-13 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.3.1, quoting++ + +2023-11-29 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.3.0 + +2023-09-30 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.2.1 + * patches/musl.patch: updated + +2023-09-21 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.8 + +2023-09-07 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.7 + +2023-08-17 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.6 + +2023-08-03 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.5 + +2023-07-21 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.4 + +2023-06-27 Pavel Vinogradov <public@sourcemage.org> + * PRE_BUILD: apply musl patches only if stable branch was selected + +2023-06-22 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.3 + +2023-06-09 Florian Franzmann <bwlf@bandrate.org> + * 0001-install-GL-headers-in-.mesa.patch: update patch + +2023-06-08 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.2 + +2023-05-26 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.1 + +2023-05-11 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.1.0 + +2023-04-21 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.0.3 + +2023-04-08 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.0.2, updated watch line + +2023-03-25 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.0.1 + * DEPENDS: unified llvm dependency + +2023-02-24 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 23.0.0 + +2023-02-23 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 22.3.6 + +2023-02-21 Pavel Vinogradov <public@sourcemage.org> + * BUILD: dropped obsolete MESA_DRI code + * CONFIGURE: handle the disabled GLX option + * DEPENDS: made bunch of X11 libraries optional + +2023-02-08 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 22.3.5 + +2023-01-26 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 22.3.4 + +2022-12-30 Pavel Vinpgradov <public@sourcemage.org> + * DETAILS: version 22.3.2 + +2022-12-28 Pavel Vinpgradov <public@sourcemage.org> + * DEPENDS: needs glslang + 2022-12-02 Pavel Vinogradov <public@sourcemage.org> * CONFIGURE, DEPENDS: removed xvmc option completely diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD index 387dbfbcfe..348da290d9 100755 --- a/graphics-libs/mesa/PRE_BUILD +++ b/graphics-libs/mesa/PRE_BUILD @@ -1,7 +1,9 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -apply_patch_dir patches && +if [[ "${MESA_BRANCH}" == "stable" ]]; then + apply_patch_dir patches +fi && if is_depends_enabled "$SPELL" smgl-gl_select; then patch -fp1 -i "$SPELL_DIRECTORY"/0001-install-GL-headers-in-.mesa.patch diff --git a/graphics-libs/mesa/SUB_DEPENDS b/graphics-libs/mesa/SUB_DEPENDS index ba221c693d..dfb0e9383a 100755 --- a/graphics-libs/mesa/SUB_DEPENDS +++ b/graphics-libs/mesa/SUB_DEPENDS @@ -5,8 +5,8 @@ case $THIS_SUB_DEPENDS in fi ;; GLES2) - if [[ "$MESA_GLES2" == "gles2=false" ]];then - MESA_GLES="gles2=true" + if [[ "$MESA_GLES2" != "gles2=enabled" ]]; then + MESA_GLES2="gles2=enabled" fi ;; *) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;; diff --git a/graphics-libs/mesa/patches/musl.patch b/graphics-libs/mesa/patches/musl.patch index 5b9270cf41..81b1526945 100644 --- a/graphics-libs/mesa/patches/musl.patch +++ b/graphics-libs/mesa/patches/musl.patch @@ -1,16 +1,5 @@ Origin: Void Linux ---- a/src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:28.033079796 +0200 -+++ b/src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:48.832054666 +0200 -@@ -35,6 +35,8 @@ - #define VMW_SCREEN_H_ - - -+#include <sys/types.h> /* dev_t */ -+ - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - --- a/src/gallium/frontends/nine/threadpool.h 2015-05-07 14:10:53.443337212 +0200 +++ b/src/gallium/frontends/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 @@ -24,6 +24,8 @@ diff --git a/graphics-libs/opencl-headers/CONFIGURE b/graphics-libs/opencl-headers/CONFIGURE new file mode 100755 index 0000000000..90942b1d59 --- /dev/null +++ b/graphics-libs/opencl-headers/CONFIGURE @@ -0,0 +1 @@ +. "${GRIMOIRE}/CMAKE_CONFIGURE" diff --git a/graphics-libs/opencl-headers/DEPENDS b/graphics-libs/opencl-headers/DEPENDS new file mode 100755 index 0000000000..31f7a5892d --- /dev/null +++ b/graphics-libs/opencl-headers/DEPENDS @@ -0,0 +1 @@ +. "${GRIMOIRE}/CMAKE_DEPENDS" diff --git a/graphics-libs/opencl-headers/DETAILS b/graphics-libs/opencl-headers/DETAILS index 4d19c6c560..5297146c5c 100755 --- a/graphics-libs/opencl-headers/DETAILS +++ b/graphics-libs/opencl-headers/DETAILS @@ -1,8 +1,9 @@ +. "${GRIMOIRE}/CMAKE_FUNCTIONS" SPELL=opencl-headers - VERSION=2020.06.16 + VERSION=2023.12.14 SOURCE="$SPELL-$VERSION.tar.gz" SOURCE_URL[0]=https://github.com/KhronosGroup/OpenCL-Headers/archive/v$VERSION.tar.gz - SOURCE_HASH=sha512:702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391 + SOURCE_HASH=sha512:71a21f32cc2d956ef52ea197a95f21a3df5cf4e6888b533eb8cc66be0025fafe9b6477d3de813cb1ae6303032c80bc10b5e5ab1c71074f1662a6b5296fffd3d3 SOURCE_DIRECTORY="$BUILD_DIRECTORY/OpenCL-Headers-$VERSION" WEB_SITE="https://www.khronos.org/registry/OpenCL/" LICENSE[0]="Apache-2.0" diff --git a/graphics-libs/opencl-headers/HISTORY b/graphics-libs/opencl-headers/HISTORY index f0756cc8a9..8d2c6084d6 100644 --- a/graphics-libs/opencl-headers/HISTORY +++ b/graphics-libs/opencl-headers/HISTORY @@ -1,2 +1,8 @@ +2024-03-05 Conner Clere <xenanthropy@sourcemage.org> + * DETAILS: version 2023.12.14, convert to cmake + * BUILD, INSTALL: removed + * DEPENDS: added, CMAKE_DEPENDS + * CONFIGURE: added, CMAKE_CONFIGURE + 2020-12-15 Ismael Luceno <ismael@sourcemage.org> * BUILD, DETAILS, INSTALL: spell created diff --git a/graphics-libs/opencsg/DETAILS b/graphics-libs/opencsg/DETAILS index 3a9a68ebb7..586da6be9b 100755 --- a/graphics-libs/opencsg/DETAILS +++ b/graphics-libs/opencsg/DETAILS @@ -1,8 +1,8 @@ SPELL=opencsg - VERSION=1.4.2 + VERSION=1.5.1 SOURCE="OpenCSG-${VERSION}.tar.gz" - SOURCE_URL[0]=http://www.${SPELL}.org/${SOURCE} - SOURCE_HASH=sha512:fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778 + SOURCE_URL[0]=https://www.${SPELL}.org/${SOURCE} + SOURCE_HASH=sha512:aef3e785e730fd8f2ee06719d1c7a57c105e7432fb4dc6f4ad4305aabf1c7d4438ef869ae4eb840dc272b35f20c4ff296e6dd5418337230081e74ac4c91cd342 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/OpenCSG-${VERSION}" WEB_SITE="http://www.opencsg.org" LICENSE[0]=GPL diff --git a/graphics-libs/opencsg/HISTORY b/graphics-libs/opencsg/HISTORY index c1e4da130b..c37476f7ba 100644 --- a/graphics-libs/opencsg/HISTORY +++ b/graphics-libs/opencsg/HISTORY @@ -1,3 +1,6 @@ +2023-01-14 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 1.5.1 + 2020-01-18 Florian Franzmann <bwlf@bandrate.org> * PRE_BUILD, 0001-do-not-build-examples.patch, 0001-install-to-usr.patch: do not build examples (which fail to diff --git a/graphics-libs/opencv4/DETAILS b/graphics-libs/opencv4/DETAILS index 065d576605..14083bedbe 100755 --- a/graphics-libs/opencv4/DETAILS +++ b/graphics-libs/opencv4/DETAILS @@ -1,7 +1,7 @@ source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=opencv4 - VERSION=4.6.0 - SOURCE_HASH=sha512:93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 + VERSION=4.9.0 + SOURCE_HASH=sha512:1598ae59849e7805b3cbec5260bb501006f26edff452343b366b9262a0f48a6e09f4b2e760209cb677f2a64a7b22f4e70bc6195c104bcea74cc9fe04031d0292 IPPV=ippicv_2020_lnx_intel64_20191018_general.tgz GIT=a56b6ac6f030c312b2dce17430eef13aed9af274 SOURCE=${SPELL}-$VERSION.tar.gz @@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%?}-${VERSION} URL=https://github.com/opencv SOURCE_URL[0]=$URL/opencv/archive/$VERSION.tar.gz if ! list_find "$CV_CONTRIB" none ;then - SOURCE2_HASH=sha512:2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d + SOURCE2_HASH=sha512:ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043 SOURCE2=opencv_contrib-$VERSION.tar.gz SOURCE2_URL[0]=$URL/opencv_contrib/archive/$VERSION.tar.gz fi diff --git a/graphics-libs/opencv4/HISTORY b/graphics-libs/opencv4/HISTORY index e7429b907e..d7f29bc4e8 100644 --- a/graphics-libs/opencv4/HISTORY +++ b/graphics-libs/opencv4/HISTORY @@ -1,3 +1,15 @@ +2024-01-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.9.0 + +2023-11-05 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.8.1 + +2023-06-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.8.0 + +2023-01-06 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.7.0 + 2022-07-27 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: switch to PKG-CONFIG provider (automated) diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS index 1c43e81a39..b66abe41c4 100755 --- a/graphics-libs/openjpeg/DETAILS +++ b/graphics-libs/openjpeg/DETAILS @@ -1,10 +1,11 @@ . "${GRIMOIRE}/CMAKE_FUNCTIONS" SPELL=openjpeg - VERSION=2.5.0 - SOURCE_HASH=sha512:08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a + VERSION=2.5.2 + SOURCE_HASH=sha512:24c058b3e0710e689ba7fd6bce8a88353ce64e825b2e5bbf6b00ca3f2a2ec1e9c70a72e0252a5c89d10c537cf84d55af54bf2f16c58ca01db98c2018cf132e1a SECURITY_PATCH=6 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_URL[0]=https://github.com/uclouvain/${SPELL}/archive/v${VERSION}.tar.gz +# Watch: https://github.com/uclouvain/openjpeg/tags tags/v([0-9.]+)[.]tar SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" DOC_DIRS="" LICENSE[0]=BSD diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY index a0c13336f8..74a4d163e3 100644 --- a/graphics-libs/openjpeg/HISTORY +++ b/graphics-libs/openjpeg/HISTORY @@ -1,3 +1,6 @@ +2024-02-28 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 2.5.2, added Watch line + 2022-05-14 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.5.0 diff --git a/graphics-libs/poppler-data/DETAILS b/graphics-libs/poppler-data/DETAILS index f01653f96d..24751fbc39 100755 --- a/graphics-libs/poppler-data/DETAILS +++ b/graphics-libs/poppler-data/DETAILS @@ -1,5 +1,5 @@ SPELL=poppler-data - VERSION=0.4.11 + VERSION=0.4.12 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=https://poppler.freedesktop.org/$SOURCE diff --git a/graphics-libs/poppler-data/HISTORY b/graphics-libs/poppler-data/HISTORY index 2a4c609da1..457acd8064 100644 --- a/graphics-libs/poppler-data/HISTORY +++ b/graphics-libs/poppler-data/HISTORY @@ -1,3 +1,6 @@ +2023-02-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.4.12 + 2021-10-01 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.4.11 * DETAILS: add gpg checking diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS index 63e7e04419..1c763c3b35 100755 --- a/graphics-libs/poppler/DEPENDS +++ b/graphics-libs/poppler/DEPENDS @@ -3,6 +3,7 @@ depends libxml2 && depends freetype2 && depends fontconfig && depends poppler-data && +depends zlib && optional_depends boost -DENABLE_BOOST={ON,OFF} 'for Splash support' && optional_depends curl -DENABLE_LIBCURL={ON,OFF} 'HTTP support' && optional_depends glib2 '' '' 'GLib support' && @@ -15,7 +16,7 @@ optional_depends JPEG \ optional_depends openjpeg \ -DENABLE_LIBOPENJPEG={openjpeg2,none} "for JPX (JPEG 2000) streams" && optional_depends tiff '' '' 'for TIFF support' && -optional_depends zlib '' '' "for compressed file support" && +optional_depends gpgme '' '' 'signature handling' && optional_depends gtk+3 -DBUILD_GTK_TESTS={ON,OFF} "GTK tests" && optional_depends qtbase -DENABLE_QT5={ON,OFF} "Qt5 support" && optional_depends qt6base -DENABLE_QT6={ON,OFF} "Qt6 support" && diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS index 1757e8253e..99bf0d3390 100755 --- a/graphics-libs/poppler/DETAILS +++ b/graphics-libs/poppler/DETAILS @@ -10,10 +10,10 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" SOURCE_IGNORE=volatile else if [[ $POPPLER_BRANCH == devel ]]; then - VERSION=22.12.0 + VERSION=24.04.0 else - VERSION=22.12.0 - fi + VERSION=24.04.0 +fi SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=https://poppler.freedesktop.org/$SOURCE diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY index 03c1bfe42a..3c1c89415a 100644 --- a/graphics-libs/poppler/HISTORY +++ b/graphics-libs/poppler/HISTORY @@ -1,3 +1,55 @@ +2024-04-04 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 24.04.0 + +2024-03-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 24.03.0 + +2024-02-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 24.02.0 + +2024-01-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 24.01.0 + +2023-12-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.12.0 + +2023-11-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.11.0 + +2023-10-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.10.0 + +2023-09-06 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.09.0 + +2023-08-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.08.0 + +2023-07-04 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.07.0 + * DEPENDS: zlib required + +2023-07-03 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: add gpgme + +2023-06-05 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.06.0 + +2023-05-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.05.0 + +2023-04-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.04.0 + +2023-03-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.03.0 + +2023-02-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.02.0 + +2023-01-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 23.01.0 + 2022-12-02 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 22.12.0 diff --git a/graphics-libs/sane-backends/DETAILS b/graphics-libs/sane-backends/DETAILS index 87df5361a8..e58177101b 100755 --- a/graphics-libs/sane-backends/DETAILS +++ b/graphics-libs/sane-backends/DETAILS @@ -1,12 +1,10 @@ SPELL=sane-backends - VERSION=1.1.1 - SOURCE_HASH=sha512:25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d - VX=7d30fab4e115029d91027b6a58d64b43 + VERSION=1.3.0 + SOURCE_HASH=sha512:e1b139d2588dee2d4478b4b3001c1d164ef293bf268720c73b001fdfd5b18b0a2052c692b9af55a09c06ec4242de6a0006c7956a7da4253fc5fd1e560d3b528b SECURITY_PATCH=1 SOURCE=$SPELL-$VERSION.tar.gz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=https://gitlab.com/sane-project/backends/uploads/$VX/$SOURCE - +SOURCE_DIRECTORY=$BUILD_DIRECTORY/backends-$VERSION + SOURCE_URL[0]=https://gitlab.com/sane-project/backends/-/archive/$VERSION/backends-$VERSION.tar.gz LICENSE[0]=GPL WEB_SITE=https://www.sane-project.org/ ENTERED=20020819 diff --git a/graphics-libs/sane-backends/HISTORY b/graphics-libs/sane-backends/HISTORY index 68fc352e68..567b802784 100644 --- a/graphics-libs/sane-backends/HISTORY +++ b/graphics-libs/sane-backends/HISTORY @@ -1,3 +1,10 @@ +2024-04-07 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.3.0 + * PRE_BUILD: added + +2023-09-16 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.2.1 + 2022-05-06 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.1 diff --git a/graphics-libs/sane-backends/PRE_BUILD b/graphics-libs/sane-backends/PRE_BUILD new file mode 100755 index 0000000000..2eb5119d71 --- /dev/null +++ b/graphics-libs/sane-backends/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +#autoreconf -f -i --symlink +./autogen.sh diff --git a/graphics-libs/tiff/DEPENDS b/graphics-libs/tiff/DEPENDS index dee55634f1..719e1aae85 100755 --- a/graphics-libs/tiff/DEPENDS +++ b/graphics-libs/tiff/DEPENDS @@ -1,5 +1,9 @@ depends automake && +optional_depends python-sphinx \ + --{enable,disable}-sphinx \ + 'to build API documentation' && + optional_depends libice \ '' \ '' \ diff --git a/graphics-libs/tiff/DETAILS b/graphics-libs/tiff/DETAILS index 9eb796b856..cfa3df7dac 100755 --- a/graphics-libs/tiff/DETAILS +++ b/graphics-libs/tiff/DETAILS @@ -1,6 +1,7 @@ +# Watch: https://download.osgeo.org/libtiff/ SPELL=tiff - VERSION=4.4.0 - SOURCE_HASH=sha512:78ffab7667d0feb8d38571bc482390fc6dd20b93a798ab3a8b5cc7d5ab00b44a37f67eb8f19421e4ab33ad89ab40e382128f8a4bbdf097e0efb6d9fca5ac6f9e + VERSION=4.6.0 + SOURCE_HASH=sha512:80a117780fe5e2519b5c6661efa90a8a1e4591eb6300068b611ff9887285641c0782d9835482f589d6d109c3be6ffab8831c3561bb40e2456258deb1e896f08e SECURITY_PATCH=11 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=https://download.osgeo.org/libtiff/$SOURCE diff --git a/graphics-libs/tiff/HISTORY b/graphics-libs/tiff/HISTORY index 07995ee52a..f3bb9da5e0 100644 --- a/graphics-libs/tiff/HISTORY +++ b/graphics-libs/tiff/HISTORY @@ -1,3 +1,19 @@ +2024-02-10 Justin Boffemmyer <flux@sorcemage.org> + * INSTALL: remove, tiff no longer supplies libtiff.so.5 so the symlink + is no longer valid + +2023-09-14 Pavel Vinogradov <public@sorcemage.org> + * DETAILS: version 4.6.0 + +2023-07-02 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.5.1 + +2023-01-05 Ismael Luceno <ismael@sourcemage.org> + * DEPENDS: added missing dependency on python-sphinx + +2022-12-15 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 4.5.0 + 2022-05-28 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 4.4.0 diff --git a/graphics-libs/tiff/INSTALL b/graphics-libs/tiff/INSTALL deleted file mode 100755 index 1c27401bd2..0000000000 --- a/graphics-libs/tiff/INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -default_install && - -# symlink those so that skype still works after the update -ln -vsf "$TRACK_ROOT/usr/lib/libtiff.so.5" \ - "$INSTALL_ROOT/usr/lib/libtiff.so.4" diff --git a/graphics-libs/vips/CONFIGURE b/graphics-libs/vips/CONFIGURE new file mode 100755 index 0000000000..9f48d22f39 --- /dev/null +++ b/graphics-libs/vips/CONFIGURE @@ -0,0 +1 @@ +. "${GRIMOIRE}/MESON_CONFIGURE" diff --git a/graphics-libs/vips/DEPENDS b/graphics-libs/vips/DEPENDS index 6378e224fd..253af56870 100755 --- a/graphics-libs/vips/DEPENDS +++ b/graphics-libs/vips/DEPENDS @@ -1,23 +1,117 @@ -depends -sub CXX gcc && -depends gtk+2 && -depends glib2 && -depends libxml2 && -depends gettext && -depends xorg-libs && -depends PKG-CONFIG && -depends xml-parser-expat && - -optional_depends libexif "--with-libexif" "--without-libexif" "For libexif support" && -optional_depends JPEG "--with-jpeg" "--without-jpeg" "For JPEG support" && -optional_depends libpng "--with-png" "--without-png" "For PNG support" && -optional_depends tiff "--with-tiff" "--without-tiff" "For TIFF support" && -optional_depends openexr "--with-OpenEXR" "--without-OpenEXR" "For openexr support" && -optional_depends v4l-utils "--with-v4l" "--without-v4l" "For v4l support" && -optional_depends imagemagick "--with-magick" "--without-magick" "For ImageMagic support" && -optional_depends lcms2 "--with-lcms" "--without-lcms" "For LCMS support" && -optional_depends fftw "--with-fftw" "--without-fftw" "For FFT support" && -optional_depends zip "--with-zip" "--without-zip" "For Zip support" && -optional_depends python "--with-python" "--without-python" "For python bindings" && -optional_depends pango "--with-pangoft2" "--without-pangoft2" "For pango support" -optional_depends cfitsio "--with-cfitsio" "--without-cfitsio" -optional_depends orc "--with-orc" "--without-orc" +. "${GRIMOIRE}/MESON_DEPENDS" && +depends -sub CXX gcc && +depends glib2 && +depends libxml2 && +depends gettext && +depends PKG-CONFIG && +depends xml-parser-expat && + +optional_depends libexif \ + "exif=enabled" \ + "exif=disabled" \ + "For libexif support" && + +optional_depends JPEG \ + "jpeg=enabled" \ + "jpeg=disabled" \ + "For JPEG support" && + +optional_depends libpng \ + "png=enabled" \ + "png=disabled" \ + "For PNG support" && + +optional_depends tiff \ + "tiff=enabled" \ + "tiff=disabled" \ + "For TIFF support" && + +optional_depends openexr \ + "openexr=enabled" \ + "openexr=disabled" \ + "For openexr support" && + +optional_depends imagemagick \ + "magick=enabled" \ + "magick=disabled" \ + "For ImageMagick support" && + +optional_depends lcms2 \ + "lcms=enabled" \ + "lcms=disabled" \ + "For LCMS support" && + +optional_depends fftw \ + "fftw=enabled" \ + "fftw=disabled" \ + "For FFTW support" && + +optional_depends cfitsio \ + "cfitsio=enabled" \ + "cfitsio=disabled" \ + "For cfitsio support" && + +optional_depends orc \ + "orc=enabled" \ + "orc=disabled" \ + "For orc support" && + +optional_depends fontconfig \ + "fontconfig=enabled" \ + "fontconfig=disabled" \ + "For fontconfig support" && + +optional_depends openjpeg \ + "openjpeg=enabled" \ + "openjpeg=disabled" \ + "For openjpeg support" && + +optional_depends poppler \ + "poppler=enabled" \ + "poppler=disabled" \ + "For poppler support" && + +optional_depends librsvg2 \ + "rsvg=enabled" \ + "rsvg=disabled" \ + "For rsvg support" && + +optional_depends libwebp \ + "webp=enabled" \ + "webp=disabled" \ + "For webp support" && + +optional_depends zlib \ + "zlib=enabled" \ + "zlib=disabled" \ + "For zlib support" && + +optional_depends pango \ + "pangocairo=enabled" \ + "pangocairo=disabled" \ + "For pango support" && + +if is_depends_enabled $SPELL pango; then + depends cairo +fi + +optional_depends gobject-introspection \ + "introspection=true" \ + "introspection=false" \ + "Build gobj data?" && + +if is_depends_enabled $SPELL gobject-introspection; then + optional_depends vala \ + "vapi=true" \ + "vapi=false" \ + "Build VAPI?" +fi && +optional_depends gtk-doc \ + "gtk_doc=true" \ + "gtk_doc=false" \ + "Build GTK-doc docs?" && + +optional_depends doxygen \ + "doxygen=true" \ + "doxygen=false" \ + "Build C++ docs?" diff --git a/graphics-libs/vips/DETAILS b/graphics-libs/vips/DETAILS index 9c18e4232b..9ab1e73fbe 100755 --- a/graphics-libs/vips/DETAILS +++ b/graphics-libs/vips/DETAILS @@ -1,11 +1,11 @@ +. "${GRIMOIRE}/MESON_FUNCTIONS" SPELL=vips - VERSION=7.30.2 - SOURCE=${SPELL}-${VERSION}.tar.gz -# SOURCE_HASH=sha512:7f2a21e2fac863d2ac43dc4a90f33e34a84d27035050357dba599e8a368b013d04f8ca03155dfc882e77004399800ae35fd40fa1919478e0b6ad0ba970806cb2 - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" + VERSION=8.14.5 + SOURCE=${SPELL}-${VERSION}.tar.xz + SOURCE_HASH=sha512:ceea6e4d378ac99eb026293e91da530b91febbd5d775b57ab807bcd60f39ca44a088161a713e31b972694d3797d4acaa97028f0e1d3ce4d9db7f8078c005dbe1 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} - SOURCE_URL[0]=http://www.vips.ecs.soton.ac.uk/supported/${VERSION:0:4}/$SOURCE - WEB_SITE=http://www.vips.ecs.soton.ac.uk/index.php + SOURCE_URL[0]=https://github.com/libvips/libvips/releases/download/v${VERSION}/$SOURCE + WEB_SITE=https://www.libvips.org/ ENTERED=20041230 LICENSE[0]=LGPL KEYWORDS="images graphics libs" diff --git a/graphics-libs/vips/HISTORY b/graphics-libs/vips/HISTORY index f0b180b544..33408db92b 100644 --- a/graphics-libs/vips/HISTORY +++ b/graphics-libs/vips/HISTORY @@ -1,3 +1,13 @@ +2023-10-25 Conner Clere <xenanthropy@sourcemage.org> + * DETAILS: version 8.14.5, replace sig verification with hash, + convert spell to meson build. Update website and source url + * vips-7.30.2.tar.gz.sig: removed, sigs no longer needed + * DEPENDS: removed hard deps: gtk+2, xorg-libs; removed optional deps: + v4l-utils, zip, python; added optional deps: cairo, fontconfig, openjpeg, + gobject-introspection, vapi, gtk-doc, poppler, lihbrsvg2, libwebp, zlib + added MESON_DEPENDS + * CONFIGURE: added, for meson build + 2022-07-27 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: switch to PKG-CONFIG provider (automated) diff --git a/graphics-libs/vips/vips-7.30.2.tar.gz.sig b/graphics-libs/vips/vips-7.30.2.tar.gz.sig Binary files differdeleted file mode 100644 index efdb16d4ce..0000000000 --- a/graphics-libs/vips/vips-7.30.2.tar.gz.sig +++ /dev/null diff --git a/graphics-libs/zxing-cpp/DETAILS b/graphics-libs/zxing-cpp/DETAILS index 1df6bd6771..8a880299df 100755 --- a/graphics-libs/zxing-cpp/DETAILS +++ b/graphics-libs/zxing-cpp/DETAILS @@ -1,7 +1,7 @@ source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=zxing-cpp - VERSION=1.4.0 - SOURCE_HASH=sha512:05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad + VERSION=2.2.1 + SOURCE_HASH=sha512:f1de8df783061a152a18cd9102ac0c579c40c76ab4a5ba9f30bcb8ddb532f3fac08736840a631adbf7c30a7fa00ce8d65625c8cd695288620601708e8f256a53 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=https://github.com/nu-book/zxing-cpp diff --git a/graphics-libs/zxing-cpp/HISTORY b/graphics-libs/zxing-cpp/HISTORY index b06e2d9af9..110a7af172 100644 --- a/graphics-libs/zxing-cpp/HISTORY +++ b/graphics-libs/zxing-cpp/HISTORY @@ -1,3 +1,12 @@ +2024-01-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.2.1 + +2023-07-23 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.1.0 + +2023-01-11 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.0.0 + 2022-08-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.4.0 * DEPENDS: add opencv4 |