Created attachment 245617 [details] Patch for libglvnd * Switch to upstream release archive Compile tested on FreeBSD 13.2-RELEASE (amd64) (make, make check-plist) Poudriere testport OK 12.4-RELEASE (amd64) Poudriere testport OK 13.2-RELEASE (amd64) Tested with following consumers in 13.2-RELEASE (amd64) using Poudriere: accessibility/caribou accessibility/gammy accessibility/qt5-speech accessibility/qt6-speech astro/celestia astro/celestia-gtk astro/nightfall astro/opencpn astro/qmapshack audio/abgate-lv2 audio/avldrums-lv2 audio/bambootracker audio/bespokesynth audio/cardinal audio/carla audio/csoundqt audio/din audio/dmidiplayer audio/dpf-plugins-lv2 audio/dragonfly-reverb-lv2 audio/drumkv1-lv2 audio/drumstick audio/dsbmixer audio/faustlive audio/fmit audio/fossmixer audio/furnace audio/gogglesmm audio/guidolib audio/hpsjam audio/jacktrip audio/jamulus audio/komposter audio/lsp-plugins-lv2 audio/midi-matrix-lv2 audio/midipp audio/mixxx audio/mixxx22 audio/moony-lv2 audio/mumble audio/muse-sequencer audio/padthv1-lv2 audio/pc-mixer audio/pianobooster audio/plasma5-kpipewire audio/polyphone audio/psindustrializer audio/qaudiosonar audio/qjackctl audio/qmidictl audio/qmidinet audio/qsampler audio/quimup audio/qxgedit audio/samplv1-lv2 audio/sherlock-lv2 audio/shuriken audio/sonic-visualiser audio/sonivox-eas audio/spectacle-lv2 audio/spectmorph audio/stmp audio/strawberry audio/synthv1-lv2 audio/tiatracker audio/virtual_oss_ctl audio/vm-lv2 audio/wolf-shaper-lv2 audio/x42-plugins-lv2 audio/zam-plugins-lv2 audio/zynaddsubfx benchmarks/unixbench biology/molden biology/sigviewer biology/ugene cad/PrusaSlicer cad/brlcad cad/calculix cad/camotics cad/freecad cad/gds3d cad/gmsh cad/kicad cad/kicad-devel cad/klayout cad/ldview cad/leocad cad/lepton-eda cad/librecad cad/librepcb cad/librnd cad/magic cad/meshlab cad/netgen cad/opencascade cad/opencascade740 cad/openctm cad/openscad cad/openscad-devel cad/openvsp cad/pcb cad/py-gmsh cad/qcsxcad cad/qelectrotech cad/qspeakers cad/qucs-s cad/repsnapper cad/solvespace cad/sumo cad/veroroute cad/z88 chinese/chinese-calendar comms/cubicsdr comms/gqrx comms/klog comms/qsstv comms/sdr++ comms/sigdigger comms/suwidgets databases/grass7 databases/grass8 databases/kexi databases/pgmodeler databases/redisdesktopmanager databases/sqlitestudio deskutils/anydesk deskutils/cairo-dock deskutils/calibre deskutils/calindori deskutils/copyq deskutils/fet deskutils/flameshot deskutils/gnome-contacts deskutils/gnome-maps deskutils/kchmviewer deskutils/kmail-account-wizard deskutils/kodaskanna deskutils/kongress deskutils/korganizer deskutils/lumina-archiver deskutils/lumina-calculator deskutils/lumina-fileinfo deskutils/lumina-fm deskutils/lumina-mediaplayer deskutils/lumina-pdf deskutils/lumina-photo deskutils/lumina-screenshot deskutils/lumina-textedit deskutils/plasma5-xdg-desktop-portal-kde deskutils/qmediamanager deskutils/qownnotes deskutils/qtfeedback deskutils/recoll deskutils/znotes devel/agar devel/allegro devel/allegro5 devel/bullet devel/efl devel/electron22 devel/electron24 devel/electron25 devel/electron26 devel/eql5 devel/fifechan devel/godot devel/godot-tools devel/godot35 devel/godot35-tools devel/guichan devel/gwenhywfar-qt5 devel/juce devel/kde-dev-utils devel/kyra devel/liteide devel/love devel/love07 devel/love08 devel/love10 devel/love5 devel/nextpnr devel/py-bullet3 devel/py-qt5-qscintilla2 devel/py-qt6-pyqt devel/py-qt6-qscintilla2 devel/pyotherside-qt5 devel/pyside2 devel/pyside2-tools devel/pyside6 devel/pyside6-tools devel/qscintilla2-designerplugin-qt5 devel/qscintilla2-qt5 devel/qscintilla2-qt6 devel/qt5-remoteobjects devel/qt6-base devel/qt6-location devel/qt6-positioning devel/qt6-remoteobjects devel/qt6-scxml devel/qt6-tools devel/qtcreator devel/raylib devel/root devel/sasm devel/sdl20 devel/seer-gdb devel/sfml devel/sfml1 devel/shadered devel/simavr devel/simgear devel/zeal editors/diamond editors/encryptpad editors/featherpad editors/focuswriter editors/imhex editors/libreoffice editors/notepadnext editors/openoffice-4 editors/openoffice-devel editors/tea editors/texmaker editors/texstudio editors/texworks editors/vscode emulators/aranym emulators/cannonball emulators/cemu emulators/dolphin-emu emulators/dosbox-staging emulators/emu64 emulators/emulationstation emulators/fceux emulators/fs-uae emulators/gens emulators/higan emulators/libretro-flycast emulators/libretro-kronos emulators/libretro-mame emulators/libretro-ppsspp emulators/libretro-reicast emulators/mame emulators/mednafen emulators/mgba emulators/mupen64plus-qt emulators/mupen64plus-video-arachnoid emulators/mupen64plus-video-glide64 emulators/mupen64plus-video-glide64mk2 emulators/mupen64plus-video-rice emulators/mupen64plus-video-z64 emulators/nestopia emulators/openmsx emulators/pcem emulators/pcsx2 emulators/ppsspp emulators/ppsspp-qt5 emulators/qemu emulators/qemu7 emulators/qmc2 emulators/reicast emulators/rpcs3 emulators/sameboy emulators/tic-80 emulators/ukncbtl emulators/vice emulators/virtualbox-ose emulators/virtualbox-ose-legacy emulators/visualboyadvance-m emulators/vt100 emulators/wine-proton finance/qtbitcointrader games/DDNet games/OpenDiablo2 games/OpenLara games/abuse_sdl games/alephone games/allacrost games/amnesia-tdd games/apoolGL games/armagetronad games/assaultcube games/astromenace games/asylum games/auralquiz games/avp games/barony games/battalion games/billardgl games/blackshadeselite games/blobby games/blockout games/blokish games/bloodfrontier games/brainparty games/briquolo games/burrtools games/bzflag games/caph games/cave9 games/cdogs-sdl games/chessx games/chromium-bsu games/chromono games/colobot games/connectagram games/connectfive games/construo games/craft games/crashtest games/criticalmass games/crrcsim games/cube games/cutemaze games/diaspora games/doomlegacy games/doomsday games/dreamchess games/duel games/dustrac games/dxx-rebirth games/eduke32 games/egl games/egoboo games/el games/emptyepsilon games/endless-sky games/etracer games/eureka games/excido games/f1spirit-remake games/fishsupper games/flightgear games/freedroidrpg games/freeminer games/freeorion games/freetennis games/gillo games/glest games/glmaze games/gltron games/gnome-2048 games/gnome-chess games/gnome-nibbles games/gnubg games/gnubik games/gnujump games/golly games/goonies games/gottet games/gracer games/hedgewars games/hexalate games/holotz-castle games/hyperrogue games/ioquake3 games/iortcw games/iqpuzzle games/irrlamb games/jaggedalliance2 games/jfsw games/jigzo games/joequake games/jvgs games/keeperrl games/kobodeluxe games/ksudoku games/kubrick games/lander games/legesmotus games/libretro-beetle_psx games/libretro-desmume2015 games/libretro-fbalpha games/libretro-fbneo games/libretro-opera games/libretro-paralleln64 games/libretro-pcsx_rearmed games/libretro-play games/libretro-tyrquake games/libretro-uae games/libretro-vecx games/lightsoff games/lincity-ng games/linwarrior games/lugaru games/manaplus games/marblemarcher games/megaglest games/memonix games/minetest games/moonlight-embedded games/motogt games/naev games/nehquake games/netherearth games/netradiant games/neverball games/nimuh games/oolite games/openage games/openarena games/opencity games/openclonk games/openenroth games/openjk games/openmw games/openrct2 games/openspades games/openxcom games/osgg games/palomino games/peg-e games/phlipple games/pinball games/pingus games/pink-pony games/pioneer games/pipewalker games/pokerth games/prboom games/prboom-plus games/py-fife games/q2pro games/quadrapassel games/quake2lnx games/r1q2 games/rawgl games/re3 games/redeclipse games/redeclipse16 games/regoth games/residualvm games/retroarch games/sauerbraten games/scourge games/scummvm games/sdb games/sdl-ball games/sea-defender games/searchandrescue games/shaaft games/shockolate games/shootingstar games/simplevaders games/simsu games/slade games/solarus games/spring games/steelstorm games/stormbaancoureur games/supertux games/supertux2 games/supertuxkart games/tanglet games/teeworlds games/tenebrae games/tesseract games/tetzle games/tomatoes games/tome4 games/tome4-beta games/torcs games/toycars games/trackballs games/tremulous games/trenchbroom games/tuxkart games/tuxracer games/ufoai games/uhexen2 games/ultimatestunts games/valyriatear games/vavoom games/violetland games/warzone2100 games/widelands games/wizznic games/wyrmgus games/xmoto games/yquake2 games/zaz german/tipp10 graphics/Coin graphics/alizams graphics/anttweakbar graphics/appleseed graphics/bgfx graphics/blender graphics/bonzomatic graphics/cairo graphics/cegui graphics/cloudcompare graphics/clutter graphics/clutter-gtk3 graphics/cogl graphics/colmap graphics/cxxplot graphics/darktable graphics/diffpdf graphics/digikam graphics/dilay graphics/diplib graphics/djview4 graphics/egl-wayland graphics/electricsheep graphics/embree graphics/engauge-digitizer graphics/eog-plugins graphics/epsonscan2 graphics/evolvotron graphics/f3d graphics/fracplanet graphics/fraqtive graphics/freeglut graphics/ftgl graphics/fv graphics/gauche-gl graphics/geomorph graphics/glaxnimate graphics/glbinding graphics/glee graphics/glew graphics/glew-wayland graphics/gliv graphics/glosm graphics/glpng graphics/glvis graphics/glx-utils graphics/gnash graphics/gource graphics/goxel graphics/gpxsee graphics/gstreamer1-plugins-gl graphics/gthumb graphics/hugin graphics/imv graphics/instant-meshes graphics/jogl graphics/katarakt graphics/klatexformula graphics/kludge3d graphics/kmscube graphics/knotter graphics/kquickimageeditor graphics/lib3ds graphics/libGLU graphics/libQGLViewer graphics/libchamplain graphics/libepoxy graphics/libgltext graphics/libprojectm graphics/magnum graphics/magnum-plugins graphics/maim graphics/mesa-demos graphics/mesa-devel graphics/mesa-libs graphics/milton graphics/mupdf graphics/ogre3d graphics/ogre3d19 graphics/open3d graphics/opencolorio graphics/opencolorio-tools graphics/opencsg graphics/opendx graphics/openfx-arena graphics/openfx-misc graphics/opensubdiv graphics/openvkl graphics/osg graphics/osg34 graphics/osgearth graphics/ospray graphics/ospray-studio graphics/oyranos graphics/partio graphics/pcl-pointclouds graphics/pencil2d graphics/peruse graphics/photoflare graphics/phototonic graphics/piglit graphics/pinpoint graphics/poppler-qt6 graphics/py-pyglet graphics/py-pyglet1 graphics/py-python-poppler-qt5 graphics/py-qt6-3d graphics/py-visvis graphics/qgis graphics/qgis-ltr graphics/qt5-opengl graphics/qt5-wayland graphics/qt6-3d graphics/qt6-imageformats graphics/qt6-lottie graphics/qt6-quickeffectmaker graphics/qt6-svg graphics/qt6-wayland graphics/qtpbfimageplugin graphics/quat-gui graphics/quesoglc graphics/qvge graphics/recastnavigation graphics/sdl2_gpu graphics/sdl_ttf graphics/seexpr graphics/seom graphics/sharpconstruct graphics/simpleviewer graphics/tiffgt graphics/tiled graphics/togl graphics/urho3d graphics/vpaint graphics/waffle graphics/waylandpp graphics/wdune graphics/wings graphics/wrapland graphics/xaos graphics/yacreader graphics/yukon java/java3d java/openjfx14 lang/basic256 lang/erlang-wx lang/kf5-kross lang/smalltalk lang/squeak mail/datovka mail/thunderbird math/alberta math/asymptote math/curv math/freefem++ math/g2o math/geogram math/giacxcas math/mathgl math/mathmod math/minizinc-ide math/octave math/octomap math/openmesh math/poly2tri math/qalculate-qt math/qwtplot3d math/scilab math/the-algorithms-c++ math/ump math/vtk8 math/vtk9 math/zegrapher misc/actiona misc/copperspice-examples misc/crosti misc/dartsim misc/edfbrowser misc/openhantek misc/openvdb misc/qbrew misc/qlcplus misc/qt5ct misc/qt6ct misc/valentina misc/visp multimedia/aegisub multimedia/arcan multimedia/avidemux multimedia/avidemux-cli multimedia/avidemux-plugins multimedia/avidemux-qt5 multimedia/bino multimedia/cheese multimedia/clapper multimedia/clutter-gst multimedia/clutter-gst3 multimedia/dvbcut multimedia/ffaudioconverter multimedia/gmerlin multimedia/gstreamer1-qt multimedia/gstreamer1-vaapi multimedia/kamoso multimedia/kdenlive multimedia/kodi multimedia/kodi-addon-screensaver.biogenesis multimedia/kodi-addon-screensaver.matrixtrails multimedia/kodi-addon-screensaver.stars multimedia/kodi-addon-visualization.fishbmc multimedia/kodi-addon-visualization.shadertoy multimedia/kodi-addon-visualization.spectrum multimedia/libva-glx multimedia/libva-nvidia-driver multimedia/libva-vdpau-driver multimedia/libvdpau-va-gl multimedia/libxine multimedia/lives multimedia/minitube multimedia/mlt7 multimedia/mpc-qt multimedia/mplayer multimedia/mpv multimedia/mpvpaper multimedia/musique multimedia/mythtv multimedia/nymphcast multimedia/obs-scrab multimedia/obs-streamfx multimedia/obs-studio multimedia/olive multimedia/opentoonz multimedia/phonon-gstreamer multimedia/qmmp-qt5 multimedia/qmmp-qt6 multimedia/qt5-multimedia multimedia/qt6-multimedia multimedia/shotcut multimedia/smplayer multimedia/smtube multimedia/totem multimedia/vlc multimedia/webcamoid net/landrop net/mediastreamer net/py-qt5-networkauth net/py-qt6-networkauth net/quiterss net/spoofer net/tigervnc-server net/wlvncc net/wpa_supplicant_gui net/x2goclient net-im/chatterino2 net-im/cutegram net-im/gitterdone net-im/neochat net-im/ricochet net-im/signal-desktop net-im/spectral net-im/teamwords net-im/telegram-desktop net-p2p/qbittorrent net-p2p/retroshare polish/qnapi ports-mgmt/octopkg ports-mgmt/portrac print/gl2ps print/limereport print/posterazor print/qpdfview print/sioyek science/InsightToolkit science/afni science/avogadro2 science/avogadrolibs science/cgnslib science/chrono science/drawxtl science/elmerfem science/gabedit science/gchemutils science/geant4 science/ghemical science/iboview science/kalzium science/libghemical science/liggghts science/luscus science/medit science/molscript science/multiwfn science/openmodelica science/opensim-core science/paraview science/py-pymol science/scidavis science/shelxle science/simbody science/smoldyn science/v_sim science/vipster science/vmd science/wxmacmolplt science/xcrysden science/xdrawchem science/zotero security/picocrypt security/yubikey-manager-qt security/yubioath-desktop sysutils/UEFITool sysutils/accounts-qml-module sysutils/daggy sysutils/dsbbatmon sysutils/dsblogoutmgr sysutils/dsbmc sysutils/dsbsu sysutils/logstalgia sysutils/luckybackup sysutils/pc-networkmanager sysutils/qdirstat sysutils/qflipper sysutils/qtpass sysutils/signon-qt5 sysutils/signon-ui sysutils/tarsnap-gui sysutils/trueos-libqt5 textproc/fcitx5 textproc/obsidian textproc/pageedit textproc/qstardict textproc/sigil textproc/uim-qt5 www/chromium www/dooble www/firefox www/firefox-esr www/iridium www/kf5-kjsembed www/librewolf www/libwpe www/py-qt5-webengine www/py-qt6-webengine www/qt5-webengine www/qt5-webglplugin www/qt5-webview www/qt6-webchannel www/qt6-webengine www/qt6-webview www/tor-browser www/ungoogled-chromium www/webkit2-gtk3 www/webkit2-gtk4 www/wt x11/albert x11/aminal x11/cinnamon x11/cinnamon-session x11/cool-retro-term x11/dsbautostart x11/erun x11/fireflies x11/glcapsviewer x11/gnome-session x11/gnome-shell x11/kf5-kwayland x11/kf5-plasma-framework x11/kitty x11/lumina-core x11/mate-screensaver x11/nvidia-driver x11/nvidia-driver-470 x11/nvidia-secondary-driver x11/nvidia-settings x11/openrgb x11/oscar x11/pcdm x11/plasma5-kwayland-integration x11/plasma5-layer-shell-qt x11/plasma5-plasma-workspace x11/slop x11/virtualgl x11/wl-mirror x11/xdriinfo x11/xfce4-dashboard x11/xfce4-screensaver x11/xscreensaver x11-clocks/glclock x11-clocks/xdaliclock x11-drivers/xf86-video-ati x11-drivers/xf86-video-mach64 x11-drivers/xf86-video-mga x11-drivers/xf86-video-openchrome x11-drivers/xf86-video-r128 x11-drivers/xf86-video-savage x11-drivers/xf86-video-sunffb x11-drivers/xf86-video-tdfx x11-fm/fsv2 x11-fm/qtfm x11-fm/sushi x11-servers/xarcan x11-servers/xorg-server x11-servers/xwayland x11-servers/xwayland-devel x11-themes/Kvantum x11-themes/qgnomeplatform x11-themes/qt5-style-plugins x11-toolkits/SoXt x11-toolkits/copperspice x11-toolkits/fltk x11-toolkits/fox16 x11-toolkits/fox17 x11-toolkits/gnustep-back x11-toolkits/gtk30 x11-toolkits/gtk40 x11-toolkits/gtkglarea2 x11-toolkits/irrlicht x11-toolkits/mygui-opengl x11-toolkits/nanogui x11-toolkits/otk x11-toolkits/pangolin x11-toolkits/py-qt5-chart x11-toolkits/py-qt6-chart x11-toolkits/py-qt6-datavis3d x11-toolkits/pythonqt x11-toolkits/qml-box2d x11-toolkits/qt5-declarative x11-toolkits/qt5-declarative-test x11-toolkits/qt5-gui x11-toolkits/qt6-charts x11-toolkits/qt6-datavis3d x11-toolkits/qt6-declarative x11-toolkits/qt6-quick3d x11-toolkits/qt6-quicktimeline x11-toolkits/qt6-shadertools x11-toolkits/qt6-virtualkeyboard x11-toolkits/qwt6 x11-toolkits/soqt x11-toolkits/swt x11-toolkits/wlroots x11-toolkits/wlroots-devel x11-toolkits/wlroots015 x11-toolkits/wxgtk30 x11-toolkits/wxgtk32 x11-toolkits/xforms x11-wm/compiz x11-wm/compton x11-wm/emerald x11-wm/hyprland x11-wm/kwinft x11-wm/magpie x11-wm/muffin x11-wm/mutter x11-wm/phoc x11-wm/picom x11-wm/plasma5-kwin x11-wm/sway x11-wm/swayfx x11-wm/wayfire x11-wm/wmanager graphics/s2tc mail/datovka sysutils/fastfetch No failures except for ones already marked as broken etc
Why not using https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v${DISTVERSION}/ as the master site ?
Because that gets generated on the demand just like USE_GITHUB, causes breakage from time to time and isn't longterm stable.
How exactly this change helps? > - ${LN} -s opengl.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc > + ${RLN} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/opengl.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc It's gratuitous, longer, cryptic, and error-prone as it hardcodes the path twice.
(In reply to Alexey Dokuchaev from comment #3) It's recommended by Porters Handbook so it makes sense to follow it for consistency and we have a helper integrated into the framework?
(In reply to Daniel Engberg from comment #4) > it makes sense [...] we have a helper I'm afraid it doesn't, in this case. Helpers, by definition, allow one to simplify things, write less, avoid boilerplate, don't repeat herself. You're replacing already short and simple command with longer, hard-to-read macro. There was nothing wrong with that line, and if it ain't broken, don't fix it.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5a5aa738fa54f093b2c3f42d5936139a9fab3bc commit d5a5aa738fa54f093b2c3f42d5936139a9fab3bc Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-11-23 22:03:05 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-11-24 17:21:15 +0000 graphics/libglvnd: Update to 1.7.0 Switch to upstream release archive Changelog: https://gitlab.freedesktop.org/glvnd/libglvnd/-/releases/v1.7.0 PR: 274465 Approved by: x11 (manu) graphics/libglvnd/Makefile | 11 +++-------- graphics/libglvnd/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-)