diff options
Diffstat (limited to 'graphics')
25 files changed, 151 insertions, 52 deletions
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile index 6f9c48382907..e6ef896ace83 100644 --- a/graphics/converseen/Makefile +++ b/graphics/converseen/Makefile @@ -1,6 +1,6 @@ PORTNAME= converseen DISTVERSIONPREFIX= v -DISTVERSION= 0.14.0.0 +DISTVERSION= 0.15.0.0 CATEGORIES= graphics MAINTAINER= fernape@FreeBSD.org diff --git a/graphics/converseen/distinfo b/graphics/converseen/distinfo index 5276e215f0d1..65c0bb458917 100644 --- a/graphics/converseen/distinfo +++ b/graphics/converseen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745754508 -SHA256 (Faster3ck-Converseen-v0.14.0.0_GH0.tar.gz) = 434ab5363b0a1399b51788473ccc6907ac790f90be743b30484223ef4273f3e3 -SIZE (Faster3ck-Converseen-v0.14.0.0_GH0.tar.gz) = 962236 +TIMESTAMP = 1751528790 +SHA256 (Faster3ck-Converseen-v0.15.0.0_GH0.tar.gz) = 6e1a8f2e606919b23ea1bb7e99cc87add0be42acc3698a9397f0371385bdcb1b +SIZE (Faster3ck-Converseen-v0.15.0.0_GH0.tar.gz) = 966117 diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index f48564d52471..972382c18e18 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -1,6 +1,5 @@ PORTNAME= evince -DISTVERSION= 48.0 -PORTREVISION= 1 +DISTVERSION= 48.1 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -21,14 +20,13 @@ BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ LIB_DEPENDS= libhandy-1.so:x11-toolkits/libhandy \ libpoppler-glib.so:graphics/poppler-glib \ libspectre.so:print/libspectre \ - libtiff.so:graphics/tiff \ - libdbus-1.so:devel/dbus + libtiff.so:graphics/tiff RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas USES= compiler:c++11-lib cpe desktop-file-utils gettext gnome \ gstreamer libarchive localbase:ldflags meson pkgconfig \ python:build tar:xz xorg -USE_GNOME= cairo gdkpixbuf gnomedesktop3 gtk30 introspection:build libxml2 +USE_GNOME= cairo gdkpixbuf gtk30 libxml2 USE_LDCONFIG= yes USE_XORG= ice CPE_VENDOR= gnome @@ -43,7 +41,6 @@ MESON_ARGS+= -Dintrospection=false \ -Dpreviewer=false \ -Dthumbnail_cache=disabled \ -Dthumbnailer=false -USE_GNOME+= libxml2 OPTIONS_EXCLUDE= DBUS PLIST= ${.CURDIR}/pkg-plist-lite PKGNAMESUFFIX= -lite @@ -66,8 +63,8 @@ OPTIONS_DEFAULT= COMICS DBUS KEYRING SPELL XPS COMICS_DESC= Comic book archives support COMICS_MESON_ENABLED= comics -DBUS_MESON_TRUE= dbus -DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus +DBUS_MESON_TRUE= dbus +DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DJVU_DESC= DJVU support DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index f4c04d0ce3b6..ac8fd3452e4d 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744639068 -SHA256 (gnome/evince-48.0.tar.xz) = cd2f658355fa9075fdf9e5b44aa0af3a7e0928c55614eb1042b36176cf451126 -SIZE (gnome/evince-48.0.tar.xz) = 2942540 +TIMESTAMP = 1751557151 +SHA256 (gnome/evince-48.1.tar.xz) = 7d8b9a6fa3a05d3f5b9048859027688c73a788ff6e923bc3945126884943fa10 +SIZE (gnome/evince-48.1.tar.xz) = 2942692 diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index d4725ae61f2b..7dee2ca261ff 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -69,10 +69,10 @@ lib/girepository-1.0/EvinceDocument-%%VERSION%%.typelib lib/girepository-1.0/EvinceView-%%VERSION%%.typelib lib/libevdocument3.so lib/libevdocument3.so.4 -lib/libevdocument3.so.%%GTK4_VERSION%% +lib/libevdocument3.so.4.0.0 lib/libevview3.so lib/libevview3.so.3 -lib/libevview3.so.%%GTK3_VERSION%% +lib/libevview3.so.3.0.0 libdata/pkgconfig/evince-document-%%VERSION%%.pc libdata/pkgconfig/evince-view-%%VERSION%%.pc %%DBUS%%libexec/evinced diff --git a/graphics/evince/pkg-plist-lite b/graphics/evince/pkg-plist-lite index f072cf2f0402..c068f815bb8e 100644 --- a/graphics/evince/pkg-plist-lite +++ b/graphics/evince/pkg-plist-lite @@ -65,10 +65,10 @@ lib/evince/4/backends/tiffdocument.evince-backend %%XPS%%lib/evince/4/backends/xpsdocument.evince-backend lib/libevdocument3.so lib/libevdocument3.so.4 -lib/libevdocument3.so.%%GTK4_VERSION%% +lib/libevdocument3.so.4.0.0 lib/libevview3.so lib/libevview3.so.3 -lib/libevview3.so.%%GTK3_VERSION%% +lib/libevview3.so.3.0.0 libdata/pkgconfig/evince-document-%%VERSION%%.pc libdata/pkgconfig/evince-view-%%VERSION%%.pc share/man/man1/evince-previewer.1.gz diff --git a/graphics/libopendrive/Makefile b/graphics/libopendrive/Makefile index b96a228fdbf8..e0aff6c9efeb 100644 --- a/graphics/libopendrive/Makefile +++ b/graphics/libopendrive/Makefile @@ -1,5 +1,6 @@ PORTNAME= libopendrive PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org @@ -9,13 +10,22 @@ WWW= https://github.com/pageldev/libOpenDRIVE LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake compiler:c++14-lang +BUILD_DEPENDS= catch2>=3.4.0:devel/catch2 \ + pugixml>=1.14:textproc/pugixml +LIB_DEPENDS= libpugixml.so:textproc/pugixml + +USES= cmake compiler:c++17-lang CMAKE_ON= BUILD_SHARED_LIBS USE_GITHUB= yes GH_ACCOUNT= pageldev GH_PROJECT= libOpenDRIVE -GH_TAGNAME= edfd564 +GH_TAGNAME= 82c2dd9 + +post-patch: + @${MKDIR} ${WRKSRC}/pugixml/ + @${LN} -s ${LOCALBASE}/include/pugixml.hpp ${WRKSRC}/pugixml/pugixml.hpp + @${LN} -s ${LOCALBASE}/include/pugiconfig.hpp ${WRKSRC}/pugixml/pugiconfig.hpp .include <bsd.port.mk> diff --git a/graphics/libopendrive/distinfo b/graphics/libopendrive/distinfo index 393438c08144..156664e687d5 100644 --- a/graphics/libopendrive/distinfo +++ b/graphics/libopendrive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748107894 -SHA256 (pageldev-libOpenDRIVE-0.6.0-edfd564_GH0.tar.gz) = 89184e50350f715e88d921dda95879b8693efd14d47d0a8cb8d6bc8635089e7e -SIZE (pageldev-libOpenDRIVE-0.6.0-edfd564_GH0.tar.gz) = 132294 +TIMESTAMP = 1751375029 +SHA256 (pageldev-libOpenDRIVE-0.6.0-82c2dd9_GH0.tar.gz) = 366063848456c376b1a1e499b9f262bc0c024f579dae300ee190882900615cf5 +SIZE (pageldev-libOpenDRIVE-0.6.0-82c2dd9_GH0.tar.gz) = 152194 diff --git a/graphics/libopendrive/files/patch-CMakeLists.txt b/graphics/libopendrive/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..32b6609c0b7b --- /dev/null +++ b/graphics/libopendrive/files/patch-CMakeLists.txt @@ -0,0 +1,62 @@ +--- CMakeLists.txt.orig 2025-07-04 08:27:24 UTC ++++ CMakeLists.txt +@@ -20,22 +20,10 @@ include(CTest) + endif() + + include(CTest) +-include(FetchContent) + include(GNUInstallDirs) + +-FetchContent_Declare( +- pugixml +- GIT_REPOSITORY https://github.com/zeux/pugixml.git +- GIT_TAG v1.14 +-) +-FetchContent_MakeAvailable(pugixml) +- +-FetchContent_Declare( +- Catch2 +- GIT_REPOSITORY https://github.com/catchorg/Catch2.git +- GIT_TAG v3.4.0 +-) +-FetchContent_MakeAvailable(Catch2) ++find_package(pugixml 1.14 REQUIRED) ++find_package(Catch2 3.4.0 REQUIRED) + include(Catch) + + set(SOURCES +@@ -59,19 +47,18 @@ set(SOURCES + src/RoadObject.cpp + src/RoadSignal.cpp + src/RoutingGraph.cpp +- ${pugixml_SOURCE_DIR}/src/pugixml.cpp + ) + + add_library(OpenDrive ${SOURCES}) + target_include_directories( + OpenDrive PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml> + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> +- $<BUILD_INTERFACE:${pugixml_SOURCE_DIR}/src> + ) + + add_executable(tests tests/test.cpp) +-target_link_libraries(tests PRIVATE OpenDrive Catch2::Catch2WithMain) ++target_link_libraries(tests PRIVATE OpenDrive pugixml::pugixml Catch2::Catch2WithMain) + catch_discover_tests(tests WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests) + + install( +@@ -80,12 +67,6 @@ install( + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +-) +-install( +- FILES +- ${pugixml_SOURCE_DIR}/src/pugixml.hpp +- ${pugixml_SOURCE_DIR}/src/pugiconfig.hpp +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(TARGETS OpenDrive EXPORT OpenDriveConfig) diff --git a/graphics/libopendrive/pkg-plist b/graphics/libopendrive/pkg-plist index e54966418ff0..b94183fd63c1 100644 --- a/graphics/libopendrive/pkg-plist +++ b/graphics/libopendrive/pkg-plist @@ -1,4 +1,3 @@ -bin/test-xodr cmake/OpenDriveConfig-%%CMAKE_BUILD_TYPE%%.cmake cmake/OpenDriveConfig.cmake include/CubicBezier.hpp @@ -13,6 +12,7 @@ include/Junction.h include/Lane.h include/LaneSection.h include/LaneValidityRecord.h +include/Log.h include/Math.hpp include/Mesh.h include/OpenDriveMap.h @@ -25,6 +25,5 @@ include/RoadSignal.h include/RoutingGraph.h include/Utils.hpp include/XmlNode.h -include/pugixml/pugiconfig.hpp -include/pugixml/pugixml.hpp +include/earcut.hpp lib/libOpenDrive.so diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 22caa093d62c..a24b227dc891 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,7 +1,6 @@ PORTNAME= mesa -DISTVERSION= 25.1-branchpoint-3684 -DISTVERSIONSUFFIX= -gec05d4b1faf -PORTREVISION= 1 +DISTVERSION= 25.1-branchpoint-3766 +DISTVERSIONSUFFIX= -gd31cb824df2 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index f72b76f65a6b..9d22f67d1447 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1751496736 -SHA256 (mesa-25.1-branchpoint-3684-gec05d4b1faf.tar.bz2) = 3885f8dbb6d0edc5136cb7cd8b57c3ebf2211c01689c3776a2fc5210d6f6516a -SIZE (mesa-25.1-branchpoint-3684-gec05d4b1faf.tar.bz2) = 58260181 +TIMESTAMP = 1751655664 +SHA256 (mesa-25.1-branchpoint-3766-gd31cb824df2.tar.bz2) = 429951a9f1c70ac15787ede10cb88d601492888a709680f1eed6791a7abfd310 +SIZE (mesa-25.1-branchpoint-3766-gd31cb824df2.tar.bz2) = 58299131 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8 diff --git a/graphics/nvidia-drm-510-kmod-devel/Makefile b/graphics/nvidia-drm-510-kmod-devel/Makefile index b6bfde43b6f3..d4ce531391ae 100644 --- a/graphics/nvidia-drm-510-kmod-devel/Makefile +++ b/graphics/nvidia-drm-510-kmod-devel/Makefile @@ -1,4 +1,4 @@ -NVIDIA_DISTVERSION= 575.64 +NVIDIA_DISTVERSION= 575.64.03 # Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-drm-510-kmod diff --git a/graphics/nvidia-drm-510-kmod-devel/distinfo b/graphics/nvidia-drm-510-kmod-devel/distinfo index 7946a22f9991..9e09837b4dca 100644 --- a/graphics/nvidia-drm-510-kmod-devel/distinfo +++ b/graphics/nvidia-drm-510-kmod-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1750513021 -SHA256 (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 8b1392a796ac04738b11d8f74713d1c8be3ecbd1af8363ba8ba3599204b56057 -SIZE (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 287791452 +TIMESTAMP = 1751449876 +SHA256 (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 1fa676e43bb2da5f4458ad8feb969d7dac3438adb2f3294ca15b2c3e95522363 +SIZE (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 287548092 SHA256 (freebsd-drm-kmod-drm_v5.10.163_8_GH0.tar.gz) = ea6b04c4bbd859248aabb81bc2abc19f33d68f57decf2e41dd8f5341124227d4 SIZE (freebsd-drm-kmod-drm_v5.10.163_8_GH0.tar.gz) = 20095720 diff --git a/graphics/nvidia-drm-515-kmod-devel/Makefile b/graphics/nvidia-drm-515-kmod-devel/Makefile index c82bf66cc78e..a7b333ad8441 100644 --- a/graphics/nvidia-drm-515-kmod-devel/Makefile +++ b/graphics/nvidia-drm-515-kmod-devel/Makefile @@ -1,4 +1,4 @@ -NVIDIA_DISTVERSION= 575.64 +NVIDIA_DISTVERSION= 575.64.03 # Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-drm-515-kmod diff --git a/graphics/nvidia-drm-515-kmod-devel/distinfo b/graphics/nvidia-drm-515-kmod-devel/distinfo index c30652a950d9..3f48f97f6c2f 100644 --- a/graphics/nvidia-drm-515-kmod-devel/distinfo +++ b/graphics/nvidia-drm-515-kmod-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1750497473 -SHA256 (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 8b1392a796ac04738b11d8f74713d1c8be3ecbd1af8363ba8ba3599204b56057 -SIZE (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 287791452 +TIMESTAMP = 1751449949 +SHA256 (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 1fa676e43bb2da5f4458ad8feb969d7dac3438adb2f3294ca15b2c3e95522363 +SIZE (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 287548092 SHA256 (freebsd-drm-kmod-drm_v5.15.160_5_GH0.tar.gz) = 93fc30211374d028ec8e24872cc5ac03dab13309b637cf3bdad27f2dcb808fc0 SIZE (freebsd-drm-kmod-drm_v5.15.160_5_GH0.tar.gz) = 26098570 diff --git a/graphics/nvidia-drm-61-kmod-devel/Makefile b/graphics/nvidia-drm-61-kmod-devel/Makefile index d059040f5e2f..c36ca3f0be6e 100644 --- a/graphics/nvidia-drm-61-kmod-devel/Makefile +++ b/graphics/nvidia-drm-61-kmod-devel/Makefile @@ -1,4 +1,4 @@ -NVIDIA_DISTVERSION= 575.64 +NVIDIA_DISTVERSION= 575.64.03 # Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-drm-61-kmod diff --git a/graphics/nvidia-drm-61-kmod-devel/distinfo b/graphics/nvidia-drm-61-kmod-devel/distinfo index 934b49d0bd27..03da35fa84ce 100644 --- a/graphics/nvidia-drm-61-kmod-devel/distinfo +++ b/graphics/nvidia-drm-61-kmod-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1750497952 -SHA256 (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 8b1392a796ac04738b11d8f74713d1c8be3ecbd1af8363ba8ba3599204b56057 -SIZE (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 287791452 +TIMESTAMP = 1751450006 +SHA256 (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 1fa676e43bb2da5f4458ad8feb969d7dac3438adb2f3294ca15b2c3e95522363 +SIZE (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 287548092 SHA256 (freebsd-drm-kmod-drm_v6.1.128_4_GH0.tar.gz) = ef5ee435493351a4d123f53b503c018a5195604ad4954a052d40f103643de39d SIZE (freebsd-drm-kmod-drm_v6.1.128_4_GH0.tar.gz) = 37105937 diff --git a/graphics/nvidia-drm-66-kmod-devel/Makefile b/graphics/nvidia-drm-66-kmod-devel/Makefile index 09c5db366d3f..b7153ab3390f 100644 --- a/graphics/nvidia-drm-66-kmod-devel/Makefile +++ b/graphics/nvidia-drm-66-kmod-devel/Makefile @@ -1,4 +1,4 @@ -NVIDIA_DISTVERSION= 575.64 +NVIDIA_DISTVERSION= 575.64.03 # Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-drm-66-kmod diff --git a/graphics/nvidia-drm-66-kmod-devel/distinfo b/graphics/nvidia-drm-66-kmod-devel/distinfo index db68437d2905..a419269fc0d5 100644 --- a/graphics/nvidia-drm-66-kmod-devel/distinfo +++ b/graphics/nvidia-drm-66-kmod-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1750498510 -SHA256 (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 8b1392a796ac04738b11d8f74713d1c8be3ecbd1af8363ba8ba3599204b56057 -SIZE (NVIDIA-FreeBSD-x86_64-575.64.tar.xz) = 287791452 +TIMESTAMP = 1751450069 +SHA256 (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 1fa676e43bb2da5f4458ad8feb969d7dac3438adb2f3294ca15b2c3e95522363 +SIZE (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 287548092 SHA256 (freebsd-drm-kmod-drm_v6.6.25_5_GH0.tar.gz) = 412fe7b8db00ce7ed6339fa3099f9b17fe78b115ccb05a8714228ce70c9d0882 SIZE (freebsd-drm-kmod-drm_v6.6.25_5_GH0.tar.gz) = 38486809 diff --git a/graphics/nvidia-drm-kmod-devel/Makefile b/graphics/nvidia-drm-kmod-devel/Makefile index 1f5bfb06325a..25785ec2b87e 100644 --- a/graphics/nvidia-drm-kmod-devel/Makefile +++ b/graphics/nvidia-drm-kmod-devel/Makefile @@ -1,4 +1,4 @@ -DISTVERSION= 575.64 +DISTVERSION= 575.64.03 # Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 0 diff --git a/graphics/qb3/Makefile b/graphics/qb3/Makefile index 45b1ec96b8a9..35728a128ba8 100644 --- a/graphics/qb3/Makefile +++ b/graphics/qb3/Makefile @@ -1,6 +1,7 @@ PORTNAME= qb3 PORTVERSION= 1.3.2 DISTVERSIONPREFIX= V +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org diff --git a/graphics/qb3/files/patch-i386 b/graphics/qb3/files/patch-i386 new file mode 100644 index 000000000000..1036ecf583db --- /dev/null +++ b/graphics/qb3/files/patch-i386 @@ -0,0 +1,13 @@ +Reference: https://github.com/lucianpls/QB3/pull/27 + +--- QB3lib/QB3encode.cpp.orig 2025-04-28 20:58:34 UTC ++++ QB3lib/QB3encode.cpp +@@ -84,7 +84,7 @@ void qb3_set_encoder_stride(encsp p, size_t stride) { + // Valid values are 2 and above + // sign = true when the input data is signed + // away = true to round away from zero +-bool qb3_set_encoder_quanta(encsp p, size_t q, bool away) { ++bool qb3_set_encoder_quanta(encsp p, uint64_t q, bool away) { + if (q < 1) + return false; + p->quanta = q; diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile index 24eb07ef4d06..910ce22b8034 100644 --- a/graphics/rawstudio/Makefile +++ b/graphics/rawstudio/Makefile @@ -10,8 +10,6 @@ WWW= https://rawstudio.org/ LICENSE= GPLv2+ -BROKEN= Fails to build with libxml2 2.13+, error: use of undeclared identifier 'xmlDocPtr' - BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libcurl.so:ftp/curl \ liblcms.so:graphics/lcms \ diff --git a/graphics/rawstudio/files/patch-libxml2-2.12.7 b/graphics/rawstudio/files/patch-libxml2-2.12.7 index 39256d3688a5..6a6d8861d262 100644 --- a/graphics/rawstudio/files/patch-libxml2-2.12.7 +++ b/graphics/rawstudio/files/patch-libxml2-2.12.7 @@ -58,6 +58,26 @@ #include <libxml/xmlwriter.h> #include "rs-utils.h" +--- plugins/output-facebook/rs-facebook-client.c ++++ plugins/output-facebook/rs-facebook-client.c +@@ -19,6 +19,7 @@ + + #include <curl/curl.h> + #include <libxml/encoding.h> ++#include <libxml/tree.h> + #include <gtk/gtk.h> + #include <glib.h> + #include <glib/gstdio.h> +--- plugins/output-picasa/rs-picasa-client.c ++++ plugins/output-picasa/rs-picasa-client.c +@@ -10,6 +10,7 @@ + #include <glib.h> + #include <gtk/gtk.h> + #include <libxml/encoding.h> ++#include <libxml/tree.h> + #include <string.h> + #include <curl/curl.h> + #include "rs-picasa-client.h" --- src/rs-batch.c +++ src/rs-batch.c @@ -23,6 +23,7 @@ |