*/*: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2022-05-19 08:42:53 +02:00
parent b82cda509c
commit b61353bf88
145 changed files with 2494 additions and 682 deletions

View File

@ -1,2 +1,2 @@
GIT_SRC_HASH= 58c146a7c00ee64ca07cacbcc594121f40aa2aeb
GIT_SRC_DATE= 20220320001656
GIT_SRC_HASH= 5edc03e85bf36b928876d398c20f964eea49d947
GIT_SRC_DATE= 20220517060049

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1647787498
SHA256 (kicad/kicad/code-kicad-58c146a7c00ee64ca07cacbcc594121f40aa2aeb_GL0.tar.gz) = 1e042b68a03ef2cb0645d43e36c9b0c73c204056fc10aff819e8c41485af4eaa
SIZE (kicad/kicad/code-kicad-58c146a7c00ee64ca07cacbcc594121f40aa2aeb_GL0.tar.gz) = 45397324
TIMESTAMP = 1652887177
SHA256 (kicad/kicad/code-kicad-5edc03e85bf36b928876d398c20f964eea49d947_GL0.tar.gz) = 78bcdaa1bc9bd626b7d4e5e445099794d415d9e4167d41f08ecc81ff052bfc82
SIZE (kicad/kicad/code-kicad-5edc03e85bf36b928876d398c20f964eea49d947_GL0.tar.gz) = 51727068

View File

@ -1,2 +1,2 @@
GIT_FP_HASH= c871df2c81a894bc5e91d2d517b76884d5a918aa
GIT_FP_DATE= 20220303153735
GIT_FP_HASH= 25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9
GIT_FP_DATE= 20220429223155

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1646325864
SHA256 (kicad-footprints-c871df2c81a894bc5e91d2d517b76884d5a918aa.tar.gz) = 1e0fda5d657ec7c96826834e172e3151efb23122d815e1db61de1a1d9694d696
SIZE (kicad-footprints-c871df2c81a894bc5e91d2d517b76884d5a918aa.tar.gz) = 31568390
TIMESTAMP = 1651420056
SHA256 (kicad-footprints-25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9.tar.gz) = a34cd9b9692005db0b40b2526d90f3a6f9fe2e469608c06344befeaa60225eed
SIZE (kicad-footprints-25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9.tar.gz) = 31614362

View File

@ -924,6 +924,9 @@
%%DATADIR%%/footprints/Connector_Amphenol.pretty/Amphenol_M8S-03PMMR-SF8001.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ-3523-SMT_Horizontal.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ-3524-SMT_Horizontal.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3523N_Horizontal.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3524N_Horizontal.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3525N_Horizontal.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3533NG_Horizontal.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3533NG_Horizontal_CircularHoles.kicad_mod
%%DATADIR%%/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal.kicad_mod
@ -1137,6 +1140,7 @@
%%DATADIR%%/footprints/Connector_BarrelJack.pretty/BarrelJack_Wuerth_6941xx301002.kicad_mod
%%DATADIR%%/footprints/Connector_Card.pretty/CF-Card_3M_N7E50-A516xx-30.kicad_mod
%%DATADIR%%/footprints/Connector_Card.pretty/CF-Card_3M_N7E50-E516xx-30.kicad_mod
%%DATADIR%%/footprints/Connector_Card.pretty/SD_Hirose_DM1AA_SF_PEJ82.kicad_mod
%%DATADIR%%/footprints/Connector_Card.pretty/SD_Kyocera_145638009211859+.kicad_mod
%%DATADIR%%/footprints/Connector_Card.pretty/SD_Kyocera_145638009511859+.kicad_mod
%%DATADIR%%/footprints/Connector_Card.pretty/SD_Kyocera_145638109211859+.kicad_mod
@ -6543,6 +6547,7 @@
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_Amphenol_12401610E4-2A.kicad_mod
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_Amphenol_12401610E4-2A_CircularHoles.kicad_mod
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_GCT_USB4085.kicad_mod
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_GCT_USB4115-03-C.kicad_mod
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_HRO_TYPE-C-31-M-12.kicad_mod
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_JAE_DX07S016JA1R1500.kicad_mod
%%DATADIR%%/footprints/Connector_USB.pretty/USB_C_Receptacle_JAE_DX07S024WJ1R350.kicad_mod
@ -7905,6 +7910,8 @@
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L39.4mm_W20.3mm_Px15.24mm_Py22.86mm_Bourns_8100.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L41.9mm_W20.3mm_Px15.24mm_Py22.86mm_Bourns_8100.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L43.2mm_W22.9mm_Px17.78mm_Py30.48mm_Bourns_8100.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_VAC_T60405-S6123-X140.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_VAC_T60405-S6123-X240.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_Wuerth_WE-CMB-L.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_Wuerth_WE-CMB-M.kicad_mod
%%DATADIR%%/footprints/Inductor_THT.pretty/L_CommonMode_Wuerth_WE-CMB-S.kicad_mod
@ -8982,6 +8989,8 @@
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/AMS_QFN-4-1EP_2x2mm_P0.95mm_EP0.7x1.6mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/AO_DFN-8-1EP_5.55x5.2mm_P1.27mm_EP4.12x4.6mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/Cypress_QFN-56-1EP_8x8mm_P0.5mm_EP6.22x6.22mm_ThermalVias.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-10-1EP_2.6x2.6mm_P0.5mm_EP1.3x2.2mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-10-1EP_2.6x2.6mm_P0.5mm_EP1.3x2.2mm_ThermalVias.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-10-1EP_2x3mm_P0.5mm_EP0.64x2.4mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.55x2.48mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-10-1EP_3x3mm_P0.5mm_EP1.65x2.38mm.kicad_mod
@ -9013,6 +9022,7 @@
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-32-1EP_4x7mm_P0.4mm_EP2.64x6.44mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-44-1EP_5x8.9mm_P0.4mm_EP3.7x8.4mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-6-1EP_1.2x1.2mm_P0.4mm_EP0.3x0.94mm_PullBack.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-6-1EP_2x1.6mm_P0.5mm_EP1.15x1.3mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-6-1EP_2x1.8mm_P0.5mm_EP1.2x1.6mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-6-1EP_2x2mm_P0.5mm_EP0.61x1.42mm.kicad_mod
%%DATADIR%%/footprints/Package_DFN_QFN.pretty/DFN-6-1EP_2x2mm_P0.5mm_EP0.6x1.37mm.kicad_mod
@ -10898,6 +10908,8 @@
%%DATADIR%%/footprints/RF_Module.pretty/ESP-WROOM-02.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/ESP32-S2-MINI-1U.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/ESP32-S2-WROVER.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/ESP32-S3-WROOM-1.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/ESP32-S3-WROOM-1U.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/ESP32-WROOM-32.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/ESP32-WROOM-32U.kicad_mod
%%DATADIR%%/footprints/RF_Module.pretty/Garmin_M8-35_9.8x14.0mm_Layout6x6_P1.5mm.kicad_mod
@ -11433,6 +11445,12 @@
%%DATADIR%%/footprints/Symbol.pretty/Symbol_HighVoltage_Type2_CopperTop_VerySmall.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/Symbol_Highvoltage_Type1_CopperTop_Small.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/Symbol_Highvoltage_Type2_CopperTop_Small.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/UKCA-Logo_12x12mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/UKCA-Logo_20x20mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/UKCA-Logo_30x30mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/UKCA-Logo_40x40mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/UKCA-Logo_6x6mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/UKCA-Logo_8x8mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/WEEE-Logo_14x20mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/WEEE-Logo_21x30mm_SilkScreen.kicad_mod
%%DATADIR%%/footprints/Symbol.pretty/WEEE-Logo_28.1x40mm_SilkScreen.kicad_mod

View File

@ -1,2 +1,2 @@
GIT_P3D_HASH= 6ff98426fd51d53c55bc48025d66d3d0b0c5df92
GIT_P3D_DATE= 20220225191015
GIT_P3D_HASH= ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e
GIT_P3D_DATE= 20220419230136

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1646332712
SHA256 (kicad-packages3D-6ff98426fd51d53c55bc48025d66d3d0b0c5df92.tar.gz) = 89d2e6b332a6238a3dc0b056fd4bf171490cce8c71c5daa9288abf413ba14a22
SIZE (kicad-packages3D-6ff98426fd51d53c55bc48025d66d3d0b0c5df92.tar.gz) = 946981563
TIMESTAMP = 1651420543
SHA256 (kicad-packages3D-ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e.tar.gz) = 74230f2bfbe32a4c22e19fd3b7c0e1a5f9dda15369b8700e570baa2961c19c18
SIZE (kicad-packages3D-ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e.tar.gz) = 947124400

View File

@ -8276,6 +8276,8 @@
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_Cylinder-5x20mm_Stelvio-Kontek_PTF78_Horizontal_Open.wrl
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_Cylinder-6.3x32mm_Schurter_0031-8002_Horizontal_Open.step
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_Cylinder-6.3x32mm_Schurter_0031-8002_Horizontal_Open.wrl
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_Schurter_0031.7701.xx.step
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_Schurter_0031.7701.xx.wrl
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_TR5_Littelfuse_No560_No460.step
%%DATADIR%%/3dmodels/Fuse.3dshapes/Fuseholder_TR5_Littelfuse_No560_No460.wrl
%%DATADIR%%/3dmodels/Heatsink.3dshapes/Heatsink_125x35x50mm_3xFixationM3.step
@ -8516,6 +8518,8 @@
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_CommonMode_Toroid_Vertical_L41.9mm_W20.3mm_Px15.24mm_Py22.86mm_Bourns_8100.wrl
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_CommonMode_Toroid_Vertical_L43.2mm_W22.9mm_Px17.78mm_Py30.48mm_Bourns_8100.step
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_CommonMode_Toroid_Vertical_L43.2mm_W22.9mm_Px17.78mm_Py30.48mm_Bourns_8100.wrl
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_CommonMode_Vertical_L22mm_W20mm_Px10.5mm_Py13.5mm_ProdTech_PDUUAT16.step
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_CommonMode_Vertical_L22mm_W20mm_Px10.5mm_Py13.5mm_ProdTech_PDUUAT16.wrl
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_Radial_D10.0mm_P5.00mm_Fastron_07M.step
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_Radial_D10.0mm_P5.00mm_Fastron_07M.wrl
%%DATADIR%%/3dmodels/Inductor_THT.3dshapes/L_Radial_D10.0mm_P5.00mm_Fastron_07P.step

View File

@ -1,2 +1,2 @@
GIT_SYM_HASH= 31fd1d421e8d3dd01ece7aeca210ae4b5bab93a6
GIT_SYM_DATE= 20220303113929
GIT_SYM_HASH= b8012460109edd6bcda919783874f61961a5b890
GIT_SYM_DATE= 20220427204744

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1646332641
SHA256 (kicad-symbols-31fd1d421e8d3dd01ece7aeca210ae4b5bab93a6.tar.gz) = 3e20373507875fbdc16d2402363c674aa619f9a5a7503ec9dddc21362c0c601a
SIZE (kicad-symbols-31fd1d421e8d3dd01ece7aeca210ae4b5bab93a6.tar.gz) = 4823408
TIMESTAMP = 1651589123
SHA256 (kicad-symbols-b8012460109edd6bcda919783874f61961a5b890.tar.gz) = 4b6414795b9a92db4dc229931980b3c90e4ef9c511d0eedc5b5c1d9d2ef9543f
SIZE (kicad-symbols-b8012460109edd6bcda919783874f61961a5b890.tar.gz) = 4828946

View File

@ -1,5 +1,5 @@
PORTNAME= gnome-pomodoro
PORTVERSION= 0.20.0
PORTVERSION= 0.21.1
CATEGORIES= deskutils gnome
MAINTAINER= tagattie@FreeBSD.org
@ -19,9 +19,6 @@ USES= desktop-file-utils gettext-tools gmake gnome gstreamer libtool meson \
USE_GITHUB= yes
# clang fails to compile a C source (gnome-shell-extension.c) generated
# from vala source. USE_GCC=yes is a temporary workaround to this issue.
USE_GCC= yes
USE_GNOME= cairo glib20 gtk30 introspection
GLIB_SCHEMAS= org.gnome.pomodoro.gschema.xml \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1637306229
SHA256 (gnome-pomodoro-gnome-pomodoro-0.20.0_GH0.tar.gz) = 3fed04c14fe4f07cc412d75cc84d1348e7a9c51c91283bc1d7d57e63ac45d276
SIZE (gnome-pomodoro-gnome-pomodoro-0.20.0_GH0.tar.gz) = 6195266
TIMESTAMP = 1652859041
SHA256 (gnome-pomodoro-gnome-pomodoro-0.21.1_GH0.tar.gz) = dd611e2f60f31f00f8566c1831b6a43cc0ad8301ae75c00596518b81c7761f0d
SIZE (gnome-pomodoro-gnome-pomodoro-0.21.1_GH0.tar.gz) = 6199710

View File

@ -49,6 +49,7 @@ share/locale/es/LC_MESSAGES/gnome-pomodoro.mo
share/locale/fa/LC_MESSAGES/gnome-pomodoro.mo
share/locale/fi/LC_MESSAGES/gnome-pomodoro.mo
share/locale/fr/LC_MESSAGES/gnome-pomodoro.mo
share/locale/hr/LC_MESSAGES/gnome-pomodoro.mo
share/locale/hu/LC_MESSAGES/gnome-pomodoro.mo
share/locale/id/LC_MESSAGES/gnome-pomodoro.mo
share/locale/it/LC_MESSAGES/gnome-pomodoro.mo

View File

@ -2,6 +2,7 @@
PORTNAME= gnome-shell-extension-recent-items
PORTVERSION= 40
PORTREVISION= 1
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
@ -23,6 +24,10 @@ PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
NO_BUILD= yes
post-patch:
@${REINPLACE_CMD} -e 's|"3.36", "40", "41"|"3.36", "40", "41", "42"|g' \
${WRKSRC}/metadata.json
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/RecentItems@bananenfisch.net
cd ${WRKSRC} && ${COPYTREE_SHARE} . \

View File

@ -1,7 +1,7 @@
# Created by: Mathieu Arnold
PORTNAME= nextcloudclient
PORTVERSION= 3.4.3
PORTVERSION= 3.5.1
DISTVERSIONPREFIX= v
CATEGORIES= deskutils

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1646242002
SHA256 (nextcloud-desktop-v3.4.3_GH0.tar.gz) = 3251737259bf6b32020ae09d725cca5d7caa4389503db2250df349e2961355d4
SIZE (nextcloud-desktop-v3.4.3_GH0.tar.gz) = 14338935
TIMESTAMP = 1652803048
SHA256 (nextcloud-desktop-v3.5.1_GH0.tar.gz) = 7d0d7fd5ef80061a64b8bf06ba635ef8cb183533e38b4c1498991b50bc5a66a2
SIZE (nextcloud-desktop-v3.5.1_GH0.tar.gz) = 15392337

View File

@ -14,6 +14,9 @@ COMMENT= Prototype dependency management tool for Go
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Use Go modules
EXPIRATION_DATE= 2022-06-30
USES= go
USE_GITHUB= yes

View File

@ -2,7 +2,6 @@
PORTNAME= glide
PORTVERSION= 0.13.2
DEPRECATED= use go mod instead of glide
DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= devel
@ -13,6 +12,9 @@ COMMENT= Package Management for Golang
LICENSE= MIT
DEPRECATED= use go mod instead of glide
EXPIRATION_DATE= 2022-06-30
USE_GITHUB= yes
GH_ACCOUNT= Masterminds
USES= go

View File

@ -1,6 +1,6 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}

View File

@ -17,6 +17,8 @@ GL_COMMIT= ${LLVM_COMMIT}
# Regularly tested targets as part of Android development
LLVM_TARGETS= AArch64;ARM;BPF;X86
EXTRA_PATCHES= ${.CURDIR}/files
.include "${.CURDIR}/Makefile.snapshot"
MASTERDIR= ${.CURDIR}/../llvm-cheri

View File

@ -0,0 +1,135 @@
commit a7d0053c29e0275a7d920170fe686ba3b6d61cbf
Author: Silviu Baranga <silviu.baranga@arm.com>
Date: Wed May 18 14:31:24 2022 +0100
[Morello] Don't use a scratch register for re-aligning the stack.
Purecap can use alignd which can use csp.
This avoids using C9 as a scratch register which can cause issues
with the new varargs PCS.
diff --git llvm/lib/Target/AArch64/AArch64FrameLowering.cpp llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
index 42944b417f49..205a7576fe06 100644
--- llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
+++ llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -593,32 +593,15 @@ void AArch64FrameLowering::emitCalleeSavedFrameMoves(
// but we would then have to make sure that we were in fact saving at least one
// callee-save register in the prologue, which is additional complexity that
// doesn't seem worth the benefit.
-static unsigned findScratchNonCalleeSaveRegister(MachineBasicBlock *MBB,
- unsigned OldScratch = AArch64::NoRegister) {
-
- static const MCPhysReg ScratchCapReg1[2] = {AArch64::C6, AArch64::C9};
- static const MCPhysReg ScratchCapReg2[2] = {AArch64::C7, AArch64::C10};
-
+static unsigned findScratchNonCalleeSaveRegister(MachineBasicBlock *MBB) {
MachineFunction *MF = MBB->getParent();
-
const AArch64Subtarget &Subtarget = MF->getSubtarget<AArch64Subtarget>();
- bool HasPureCap = Subtarget.hasPureCap();
- bool Use32CapRegs = !Subtarget.use16CapRegs();
- // We can use an intra-procedural registers here since aligning the
- // prologue doesn't require having this live across branches.
- unsigned DefaultScratch = HasPureCap ? ScratchCapReg1[Use32CapRegs] : AArch64::X9;
- if (OldScratch == DefaultScratch)
- DefaultScratch = HasPureCap ? ScratchCapReg2[Use32CapRegs] : AArch64::X10;
-
- const TargetRegisterClass ScratchRegClass =
- HasPureCap ? AArch64::CapRegClass : AArch64::GPR64RegClass;
+ assert(!Subtarget.hasPureCap() &&
+ "Purecap doesn't need a scratch register");
// If MBB is an entry block, use X9 as the scratch register
- if (&MF->front() == MBB) {
- assert(DefaultScratch != OldScratch &&
- "Should not reuse scratch register");
- return DefaultScratch;
- }
+ if (&MF->front() == MBB)
+ return AArch64::X9;
const AArch64RegisterInfo &TRI = *Subtarget.getRegisterInfo();
LivePhysRegs LiveRegs(TRI);
@@ -629,15 +612,12 @@ static unsigned findScratchNonCalleeSaveRegister(MachineBasicBlock *MBB,
for (unsigned i = 0; CSRegs[i]; ++i)
LiveRegs.addReg(CSRegs[i]);
- if (OldScratch != AArch64::NoRegister)
- LiveRegs.addReg(OldScratch);
-
- // Prefer X9/C6 since it was historically used for the prologue scratch reg.
+ // Prefer X9 since it was historically used for the prologue scratch reg.
const MachineRegisterInfo &MRI = MF->getRegInfo();
- if (LiveRegs.available(MRI, DefaultScratch))
- return DefaultScratch;
+ if (LiveRegs.available(MRI, AArch64::X9))
+ return AArch64::X9;
- for (unsigned Reg : ScratchRegClass) {
+ for (unsigned Reg : AArch64::GPR64RegClass) {
if (LiveRegs.available(MRI, Reg))
return Reg;
}
@@ -650,9 +630,11 @@ bool AArch64FrameLowering::canUseAsPrologue(
MachineBasicBlock *TmpMBB = const_cast<MachineBasicBlock *>(&MBB);
const AArch64Subtarget &Subtarget = MF->getSubtarget<AArch64Subtarget>();
const AArch64RegisterInfo *RegInfo = Subtarget.getRegisterInfo();
+ bool HasPureCap = Subtarget.hasPureCap();
// Don't need a scratch register if we're not going to re-align the stack.
- if (!RegInfo->hasStackRealignment(*MF))
+ // Purecap doesn't need a scratch to re-align the stack.
+ if (HasPureCap || !RegInfo->hasStackRealignment(*MF))
return true;
// Otherwise, we can use any block as long as it has a scratch register
// available.
@@ -1542,7 +1524,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
!IsFunclet && RegInfo->hasStackRealignment(MF);
unsigned scratchSPReg = SP;
- if (NeedsRealignment) {
+ if (NeedsRealignment && !HasPureCap) {
scratchSPReg = findScratchNonCalleeSaveRegister(&MBB);
assert(scratchSPReg != AArch64::NoRegister);
}
@@ -1559,7 +1541,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
if (NeedsRealignment) {
const unsigned NrBitsToZero = Log2(MFI.getMaxAlign());
assert(NrBitsToZero > 1);
- assert(scratchSPReg != SP);
+ assert((scratchSPReg != SP) != HasPureCap);
// SUB X9, SP, NumBytes
// -- X9 is temporary register, so shouldn't contain any live data here,
diff --git llvm/test/CodeGen/AArch64/morello-sandbox-align-and-pad.ll llvm/test/CodeGen/AArch64/morello-sandbox-align-and-pad.ll
index b0e8f567e331..cb9fef678cea 100644
--- llvm/test/CodeGen/AArch64/morello-sandbox-align-and-pad.ll
+++ llvm/test/CodeGen/AArch64/morello-sandbox-align-and-pad.ll
@@ -11,8 +11,8 @@ target datalayout = "e-m:e-pf200:128:128-i8:8:32-i16:16:32-i64:64-i128:128-n32:6
define i32 @fun1() addrspace(200) {
entry:
; Allocate extra memory. CSP still needs to be 16 bytes aligned.
-; PCS16: sub c6, csp, #1024, lsl #12
-; PCS16-NEXT: sub c6, c6, #4032
+; PCS16: sub csp, csp, #1024, lsl #12
+; PCS16-NEXT: sub csp, csp, #4032
; PCS16: mov w[[REG:[0-9]+]], #2048
; PCS16-NEXT: movk w8, #64, lsl #16
@@ -34,12 +34,12 @@ declare i32 @g(i32 addrspace(200)*) local_unnamed_addr addrspace(200) #2
; CHECK-LABEL: fun2
define i32 @fun2() addrspace(200) {
entry:
-; Here we need more alignment than the stack alignment. We know that the scratch register is c6.
-; PCS16: alignd csp, c6, #14
+; Here we need more alignment than the stack alignment.
+; PCS16: alignd csp, csp, #14
; PCS16: mov w[[REG:[0-9]+]], #33554432
; PCS16: scbndse c{{.*}}, c{{.*}}, x[[REG]]
;
-; PCS32: alignd csp, c9, #11
+; PCS32: alignd csp, csp, #14
; PCS32: mov w[[REG:[0-9]+]], #33554432
; PCS32: scbndse c{{.*}}, c{{.*}}, x[[REG]]

View File

@ -1,5 +1,5 @@
PORTNAME= python-dbusmock
PORTVERSION= 0.25.0
PORTVERSION= 0.27.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1640482198
SHA256 (python-dbusmock-0.25.0.tar.gz) = 6f4ce7650ecbb022684dc158df720e199635f3a3df75f7020f4fe8f6ff0394db
SIZE (python-dbusmock-0.25.0.tar.gz) = 86669
TIMESTAMP = 1652927978
SHA256 (python-dbusmock-0.27.5.tar.gz) = 0bff30d8d01e7eef491f75d359c87765abba7001307fa8fed19cb59f06ed3c2a
SIZE (python-dbusmock-0.27.5.tar.gz) = 89775

View File

@ -30,6 +30,10 @@ USE_QT= buildtools concurrent core declarative designer gui help \
quick3d quickcontrols script serialport sql svg testlib \
webchannel widgets xml xmlpatterns
# Workaround, KF5-5.94 moved header files to subfolder. Instead of using the bundled
# syntax-highligher, just help it find the proper files.
CFLAGS+= -I${LOCALBASE}/include/KF5/KSyntaxHighlighting/KSyntaxHighlighting
SHEBANG_FILES= tests/system/tools/objectsToTable.py \
tests/system/tools/findUnusedObjects.py \
share/qtcreator/templates/wizards/files/python/file.py \

View File

@ -1,5 +1,5 @@
PORTNAME= vscode
DISTVERSION= 1.65.2
DISTVERSION= 1.67.2
CATEGORIES= editors
MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
https://nodejs.org/dist/v${NODE_VER}/:node_headers \
@ -45,7 +45,6 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libdrm.so:graphics/libdrm \
libpng.so:graphics/png \
libwebp.so:graphics/webp \
libavcodec.so:multimedia/ffmpeg \
libvpx.so:multimedia/libvpx \
libopenh264.so:multimedia/openh264 \
libcups.so:print/cups \
@ -63,13 +62,13 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
TEST_DEPENDS= electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
bash:shells/bash
USES= desktop-file-utils gl gmake gnome jpeg pkgconfig \
USES= desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \
python:build shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= microsoft
SOURCE_COMMIT_HASH= c722ca6c7eed3d7987c0d5c3df5c45f6b15e77d1
SOURCE_COMMIT_HASH= c3511e6c69bb39013c4a4b7b9566ec1ca73fc4d5
BINARY_ALIAS= python=${PYTHON_CMD}
@ -81,7 +80,7 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}
# See ${WRKSRC}/remote/.yarnrc for NODE_VER
NODE_VER= 14.16.0
NODE_VER= 16.13.0
NODE_VER_MAJOR= ${NODE_VER:C/\..*$//}
# See ${WRKSRC}/build/package.json for ESBUILD_VER_BUILD
ESBUILD_VER_BUILD= 0.14.2
@ -104,7 +103,7 @@ MAKE_ENV+= PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \
# This is a workaround to avoid filesystem violations during poudriere build
MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1
ELECTRON_DIR= ${.CURDIR}/../../devel/electron13
ELECTRON_DIR= ${.CURDIR}/../../devel/electron17
.include "${ELECTRON_DIR}/Makefile.version"
ELECTRON_DOWNLOAD_URL= https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
@ -201,7 +200,7 @@ do-build:
${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
${SED} -e 's/ / */' > SHASUMS256.txt
# build and package vscode
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.json
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.build.json
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min
# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min

View File

@ -1,13 +1,13 @@
TIMESTAMP = 1651648451
TIMESTAMP = 1652921429
SHA256 (vscode/esbuild-freebsd-64-0.14.2.tgz) = 9e5669e0afa0bdccdce9ab5c07eeec45cc3116ebdeb2739ff7f11e27c6ab6c34
SIZE (vscode/esbuild-freebsd-64-0.14.2.tgz) = 3228893
SHA256 (vscode/esbuild-freebsd-64-0.11.23.tgz) = 976dc94c9aa92d7ef029c1f5e246883986fa92626aba8c8a37876a6929c64c30
SIZE (vscode/esbuild-freebsd-64-0.11.23.tgz) = 3108323
SHA256 (vscode/node-v14.16.0-headers.tar.gz) = 4b44b92903a61c29af20550f9d25bfc3029657df6b5f0a12072a70360f7eedee
SIZE (vscode/node-v14.16.0-headers.tar.gz) = 597013
SHA256 (vscode/yarn-offline-cache-1.65.2.tar.gz) = 821cd12c98a3d0ab8ea2a6560062262a9b54c54eb75ca1d8a5c06bf70b8d87b9
SIZE (vscode/yarn-offline-cache-1.65.2.tar.gz) = 156805523
SHA256 (vscode/vscode-marketplace-exts-1.65.2.tar.gz) = 6209687ecb74bc4507de6e2aa5c270ea5d4673fffa9698eedd5898ddb0313a03
SIZE (vscode/vscode-marketplace-exts-1.65.2.tar.gz) = 1538413
SHA256 (vscode/microsoft-vscode-1.65.2_GH0.tar.gz) = bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
SIZE (vscode/microsoft-vscode-1.65.2_GH0.tar.gz) = 14424135
SHA256 (vscode/node-v16.13.0-headers.tar.gz) = 9abfc6dcd32bce3b9a978b8c23b8bb48a562c94919feba489f9bb9d4bbeeae66
SIZE (vscode/node-v16.13.0-headers.tar.gz) = 561593
SHA256 (vscode/yarn-offline-cache-1.67.2.tar.gz) = 256e42fa3a937715e3cf8b70e684de767adbeff662769be23e30a9d455d9831c
SIZE (vscode/yarn-offline-cache-1.67.2.tar.gz) = 155547818
SHA256 (vscode/vscode-marketplace-exts-1.67.2.tar.gz) = 0c79dcc3891da8720965bb1e37bf5b06d6ff468de3591a6467d0ff4c35b4894c
SIZE (vscode/vscode-marketplace-exts-1.67.2.tar.gz) = 1557167
SHA256 (vscode/microsoft-vscode-1.67.2_GH0.tar.gz) = 3edf6b340a9d49721d170ac14884a73502091122aac8c3a6190047d3ef9b15c8
SIZE (vscode/microsoft-vscode-1.67.2_GH0.tar.gz) = 14731169

View File

@ -1,11 +1,11 @@
--- build/gulpfile.extensions.js.orig 2022-02-02 16:57:24 UTC
--- build/gulpfile.extensions.js.orig 2022-05-16 17:42:35 UTC
+++ build/gulpfile.extensions.js
@@ -221,7 +221,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
@@ -222,7 +222,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
cleanExtensionsBuildTask,
task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
- task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
+// task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
- task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))),
+// task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))),
));
gulp.task(compileExtensionsBuildTask);

View File

@ -1,6 +1,6 @@
--- build/gulpfile.vscode.js.orig 2022-03-10 14:14:09 UTC
--- build/gulpfile.vscode.js.orig 2022-05-16 17:42:35 UTC
+++ build/gulpfile.vscode.js
@@ -299,7 +299,7 @@ function packageTask(platform, arch, sourceFolderName,
@@ -298,7 +298,7 @@ function packageTask(platform, arch, sourceFolderName,
.pipe(util.skipDirectories())
.pipe(util.fixWin32DirectoryPermissions())
.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523

View File

@ -1,6 +1,6 @@
--- build/lib/layersChecker.ts.orig 2022-03-10 14:14:09 UTC
--- build/lib/layersChecker.ts.orig 2022-05-16 17:42:35 UTC
+++ build/lib/layersChecker.ts
@@ -302,7 +302,7 @@ function checkFile(program: ts.Program, sourceFile: ts
@@ -307,7 +307,7 @@ function checkFile(program: ts.Program, sourceFile: ts
function createProgram(tsconfigPath: string): ts.Program {
const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);

View File

@ -1,18 +1,16 @@
--- build/npm/postinstall.js.orig 2021-09-22 11:45:58 UTC
--- build/npm/postinstall.js.orig 2022-04-11 07:30:00 UTC
+++ build/npm/postinstall.js
@@ -21,8 +21,9 @@ function yarnInstall(location, opts) {
@@ -20,7 +20,8 @@ function yarnInstall(location, opts) {
const raw = process.env['npm_config_argv'] || '{}';
const argv = JSON.parse(raw);
const original = argv.original || [];
- const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
- if (opts.ignoreEngines) {
+ const passargs = ['--ignore-optional', '--frozen-lockfile', '--offline', '--no-progress', '--verbose'];
- const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files');
+ const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose'];
+ const args = original.filter(arg => passargs.includes(arg));
+ if (opts.ignoreEngines) {
if (opts.ignoreEngines) {
args.push('--ignore-engines');
delete opts.ignoreEngines;
}
@@ -90,5 +91,5 @@ runtime "${runtime}"`;
@@ -91,5 +92,5 @@ runtime "${runtime}"`;
yarnInstall(watchPath);
}

View File

@ -1,4 +1,4 @@
--- extensions/vscode-test-resolver/src/util/processes.ts.orig 2021-02-03 15:33:23 UTC
--- extensions/vscode-test-resolver/src/util/processes.ts.orig 2022-04-11 07:30:00 UTC
+++ extensions/vscode-test-resolver/src/util/processes.ts
@@ -20,7 +20,7 @@ export function terminateProcess(p: cp.ChildProcess, e
} catch (err) {
@ -8,4 +8,4 @@
+ } else if (process.platform === 'darwin' || process.platform === 'linux' || process.platform === 'freebsd') {
try {
const cmd = path.join(extensionPath, 'scripts', 'terminateProcess.sh');
const result = cp.spawnSync(cmd, [p.pid.toString()]);
const result = cp.spawnSync(cmd, [p.pid!.toString()]);

View File

@ -1,9 +1,9 @@
--- product.json.orig 2022-02-02 16:57:24 UTC
--- product.json.orig 2022-05-16 17:42:35 UTC
+++ product.json
@@ -34,6 +34,17 @@
"GitHub.remotehub",
"GitHub.remotehub-insiders"
],
@@ -28,6 +28,17 @@
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
"urlProtocol": "code-oss",
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
+ "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484",
+ "extensionsGallery": {
+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",

View File

@ -1,6 +1,6 @@
--- src/main.js.orig 2022-03-10 14:14:09 UTC
--- src/main.js.orig 2022-04-11 07:30:00 UTC
+++ src/main.js
@@ -162,7 +162,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
@@ -160,7 +160,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
'force-color-profile'
];

View File

@ -1,6 +1,6 @@
--- src/vs/base/common/platform.ts.orig 2022-03-10 14:14:09 UTC
--- src/vs/base/common/platform.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/base/common/platform.ts
@@ -80,7 +80,7 @@ if (typeof navigator === 'object' && !isElectronRender
@@ -78,7 +78,7 @@ if (typeof navigator === 'object' && !isElectronRender
_isWindows = _userAgent.indexOf('Windows') >= 0;
_isMacintosh = _userAgent.indexOf('Macintosh') >= 0;
_isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0;
@ -9,7 +9,7 @@
_isWeb = true;
_locale = navigator.language;
_language = _locale;
@@ -90,7 +90,7 @@ if (typeof navigator === 'object' && !isElectronRender
@@ -88,7 +88,7 @@ if (typeof navigator === 'object' && !isElectronRender
else if (typeof nodeProcess === 'object') {
_isWindows = (nodeProcess.platform === 'win32');
_isMacintosh = (nodeProcess.platform === 'darwin');

View File

@ -1,6 +1,6 @@
--- src/vs/base/node/ps.ts.orig 2021-12-06 21:35:50 UTC
--- src/vs/base/node/ps.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/base/node/ps.ts
@@ -214,7 +214,7 @@ export function listProcesses(rootPid: number): Promis
@@ -218,7 +218,7 @@ export function listProcesses(rootPid: number): Promis
exec('which ps', {}, (err, stdout, stderr) => {
if (err || stderr) {
@ -9,7 +9,7 @@
reject(err || new Error(stderr.toString()));
} else {
const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh', require).fsPath);
@@ -229,7 +229,8 @@ export function listProcesses(rootPid: number): Promis
@@ -233,7 +233,8 @@ export function listProcesses(rootPid: number): Promis
}
} else {
const ps = stdout.toString().trim();

View File

@ -1,6 +1,6 @@
--- src/vs/code/electron-main/app.ts.orig 2022-03-10 14:14:09 UTC
--- src/vs/code/electron-main/app.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/code/electron-main/app.ts
@@ -554,7 +554,7 @@ export class CodeApplication extends Disposable {
@@ -585,7 +585,7 @@ export class CodeApplication extends Disposable {
services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
break;

View File

@ -1,6 +1,6 @@
--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2022-02-02 16:57:24 UTC
--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -1759,7 +1759,8 @@ export class ExtensionEditor extends EditorPane {
@@ -1752,7 +1752,8 @@ export class ExtensionEditor extends EditorPane {
switch (platform) {
case 'win32': key = rawKeyBinding.win; break;

View File

@ -0,0 +1,29 @@
--- test/automation/src/electron.ts.orig 2022-05-19 00:38:13 UTC
+++ test/automation/src/electron.ts
@@ -41,7 +41,7 @@ export async function resolveElectronConfiguration(opt
args.push('--verbose');
}
- if (process.platform === 'linux') {
+ if (process.platform === 'linux' || process.platform === 'freebsd') {
args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled
}
@@ -97,7 +97,7 @@ export function getDevElectronPath(): string {
switch (process.platform) {
case 'darwin':
return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
- case 'linux':
+ case 'linux': case 'freebsd':
return join(buildPath, 'electron', `${product.applicationName}`);
case 'win32':
return join(buildPath, 'electron', `${product.nameShort}.exe`);
@@ -110,7 +110,7 @@ export function getBuildElectronPath(root: string): st
switch (process.platform) {
case 'darwin':
return join(root, 'Contents', 'MacOS', 'Electron');
- case 'linux': {
+ case 'linux': case 'freebsd': {
const product = require(join(root, 'resources', 'app', 'product.json'));
return join(root, product.applicationName);
}

View File

@ -1,29 +0,0 @@
--- test/automation/src/electronDriver.ts.orig 2022-02-02 16:57:24 UTC
+++ test/automation/src/electronDriver.ts
@@ -42,7 +42,7 @@ export async function launch(options: LaunchOptions):
'--driver', driverIPCHandle
];
- if (process.platform === 'linux') {
+ if (process.platform === 'linux' || process.platform === 'freebsd') {
args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled
}
@@ -157,7 +157,7 @@ function getDevElectronPath(): string {
switch (process.platform) {
case 'darwin':
return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
- case 'linux':
+ case 'linux': case 'freebsd':
return path.join(buildPath, 'electron', `${product.applicationName}`);
case 'win32':
return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
@@ -170,7 +170,7 @@ function getBuildElectronPath(root: string): string {
switch (process.platform) {
case 'darwin':
return path.join(root, 'Contents', 'MacOS', 'Electron');
- case 'linux': {
+ case 'linux': case 'freebsd': {
const product = require(path.join(root, 'resources', 'app', 'product.json'));
return path.join(root, product.applicationName);
}

View File

@ -1,20 +0,0 @@
--- test/smoke/src/main.ts.orig 2022-02-02 16:57:24 UTC
+++ test/smoke/src/main.ts
@@ -130,7 +130,7 @@ if (!opts.web) {
switch (process.platform) {
case 'darwin':
return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
- case 'linux':
+ case 'linux': case 'freebsd':
return path.join(buildPath, 'electron', `${product.applicationName}`);
case 'win32':
return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
@@ -143,7 +143,7 @@ if (!opts.web) {
switch (process.platform) {
case 'darwin':
return path.join(root, 'Contents', 'MacOS', 'Electron');
- case 'linux': {
+ case 'linux': case 'freebsd': {
const product = require(path.join(root, 'resources', 'app', 'product.json'));
return path.join(root, product.applicationName);
}

View File

@ -11,6 +11,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/icudtl.dat
%%DATADIR%%/libEGL.so
%%DATADIR%%/libGLESv2.so
%%DATADIR%%/libffmpeg.so
%%DATADIR%%/libvk_swiftshader.so
%%DATADIR%%/libvulkan.so.1
%%DATADIR%%/locales/am.pak
@ -209,6 +210,10 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/github-authentication/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/github-authentication/dist/nls.metadata.json
%%DATADIR%%/resources/app/extensions/github-authentication/images/icon.png
%%DATADIR%%/resources/app/extensions/github-authentication/media/auth.css
%%DATADIR%%/resources/app/extensions/github-authentication/media/favicon.ico
%%DATADIR%%/resources/app/extensions/github-authentication/media/icon.png
%%DATADIR%%/resources/app/extensions/github-authentication/media/index.html
%%DATADIR%%/resources/app/extensions/github-authentication/package.json
%%DATADIR%%/resources/app/extensions/github-authentication/package.nls.json
%%DATADIR%%/resources/app/extensions/github/README.md
@ -220,6 +225,16 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/github/markdown.css
%%DATADIR%%/resources/app/extensions/github/package.json
%%DATADIR%%/resources/app/extensions/github/package.nls.json
%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE/a.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE/b.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE/x.txt
%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE/a.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE/b.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE/x.txt
%%DATADIR%%/resources/app/extensions/github/testWorkspace/some-markdown.md
%%DATADIR%%/resources/app/extensions/github/testWorkspace/x.txt
%%DATADIR%%/resources/app/extensions/go/language-configuration.json
%%DATADIR%%/resources/app/extensions/go/package.json
%%DATADIR%%/resources/app/extensions/go/package.nls.json
@ -362,6 +377,8 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js
%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/nls.metadata.json
%%DATADIR%%/resources/app/extensions/markdown-language-features/esbuild-notebook.js
%%DATADIR%%/resources/app/extensions/markdown-language-features/esbuild-preview.js
%%DATADIR%%/resources/app/extensions/markdown-language-features/icon.png
%%DATADIR%%/resources/app/extensions/markdown-language-features/media/highlight.css
%%DATADIR%%/resources/app/extensions/markdown-language-features/media/index.js
@ -414,6 +431,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/nls.metadata.json
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/auth.css
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/favicon.ico
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/icon.png
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/index.html
%%DATADIR%%/resources/app/extensions/microsoft-authentication/package.json
@ -421,8 +439,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/LICENSE.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/README.md
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/SECURITY.md
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/ThirdPartyNotices.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/ci.yml
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/out/extension.js
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/out/extension.js.LICENSE.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/resources/logo.png
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/LICENSE.txt
@ -478,6 +497,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/customBreakpoints.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/debugAdapter.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/basicCpuProfiler.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/basicHeapProfiler.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/heapDumpProfiler.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/sources.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/stackTrace.nls.metadata.json
@ -524,19 +544,23 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/README.md
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/SECURITY.md
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/ThirdPartyNotices.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/azure-pipelines.yml
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js.map
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/media/icon.png
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/README.md
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/client.bundle.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/ThirdPartyNotices.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/ci.yml
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/cpu-client.bundle.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.web.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/heap-client.bundle.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/resources/icon.png
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/tsconfig.browser.json
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.client.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.cpu-client.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.extension.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.heap-client.js
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/README.md
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/cancellationToken.js
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/cs/diagnosticMessages.generated.json
@ -668,7 +692,6 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/powershell/language-configuration.json
%%DATADIR%%/resources/app/extensions/powershell/package.json
%%DATADIR%%/resources/app/extensions/powershell/package.nls.json
%%DATADIR%%/resources/app/extensions/powershell/snippets/powershell.code-snippets
%%DATADIR%%/resources/app/extensions/powershell/syntaxes/powershell.tmLanguage.json
%%DATADIR%%/resources/app/extensions/pug/language-configuration.json
%%DATADIR%%/resources/app/extensions/pug/package.json
@ -687,6 +710,10 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/razor/package.json
%%DATADIR%%/resources/app/extensions/razor/package.nls.json
%%DATADIR%%/resources/app/extensions/razor/syntaxes/cshtml.tmLanguage.json
%%DATADIR%%/resources/app/extensions/restructuredtext/language-configuration.json
%%DATADIR%%/resources/app/extensions/restructuredtext/package.json
%%DATADIR%%/resources/app/extensions/restructuredtext/package.nls.json
%%DATADIR%%/resources/app/extensions/restructuredtext/syntaxes/rst.tmLanguage.json
%%DATADIR%%/resources/app/extensions/ruby/language-configuration.json
%%DATADIR%%/resources/app/extensions/ruby/package.json
%%DATADIR%%/resources/app/extensions/ruby/package.nls.json
@ -720,6 +747,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/simple-browser/dist/extension.js
%%DATADIR%%/resources/app/extensions/simple-browser/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/simple-browser/dist/nls.metadata.json
%%DATADIR%%/resources/app/extensions/simple-browser/esbuild-preview.js
%%DATADIR%%/resources/app/extensions/simple-browser/media/codicon.css
%%DATADIR%%/resources/app/extensions/simple-browser/media/codicon.ttf
%%DATADIR%%/resources/app/extensions/simple-browser/media/icon.png
@ -828,7 +856,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/node_modules.asar
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@parcel/watcher/build/Release/watcher.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/sqlite3/build/Release/sqlite.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/sqlite3/build/Release/vscode-sqlite3.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/keytar/build/Release/obj.target/keytar.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/native-is-elevated/build/Release/iselevated.node
@ -885,9 +913,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.js
%%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.nls.js
%%DATADIR%%/resources/app/out/vs/loader.js
%%DATADIR%%/resources/app/out/vs/platform/driver/node/driver.js
%%DATADIR%%/resources/app/out/vs/platform/environment/node/userDataPath.js
%%DATADIR%%/resources/app/out/vs/platform/extensionManagement/common/media/defaultIcon.png
%%DATADIR%%/resources/app/out/vs/platform/extensions/node/extensionHostStarterWorker.js
%%DATADIR%%/resources/app/out/vs/platform/extensions/node/extensionHostStarterWorkerMain.js
%%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
@ -903,8 +929,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/back-tb.png
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/forward-tb.png
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress.svg
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hcDark.svg
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hcLight.svg
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-light.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/audioCues/browser/media/break.opus
%%DATADIR%%/resources/app/out/vs/workbench/contrib/audioCues/browser/media/error.opus
%%DATADIR%%/resources/app/out/vs/workbench/contrib/audioCues/browser/media/foldedAreas.opus
@ -931,6 +958,8 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js
%%DATADIR%%/resources/app/out/vs/workbench/contrib/output/common/outputLinkComputer.js
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh
%%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/fake.html
@ -940,6 +969,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/service-worker.js
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/colorTheme.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/commandPalette.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/dark-hc.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/dark.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/debug.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/extensions-web.svg
@ -949,9 +979,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/interactivePlayground.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/languages.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/learn.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/light-hc.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/light.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/menuBar.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/monokai.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/more.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookThemes/colab.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookThemes/default.png
@ -971,6 +1001,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeOverlay/browser/media/commandpalette.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/workspace/browser/media/trusted-badge.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/workspace/browser/media/untrusted-status.png
%%DATADIR%%/resources/app/out/vs/workbench/services/extensionManagement/common/media/defaultIcon.png
%%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
%%DATADIR%%/resources/app/out/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.js
%%DATADIR%%/resources/app/out/vs/workbench/services/search/worker/localFileSearch.js

View File

@ -1,5 +1,5 @@
PORTNAME= yuzu
PORTVERSION= s20220511
PORTVERSION= s20220517
CATEGORIES= emulators
.if make(makesum)
MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@ -41,12 +41,12 @@ TEST_DEPENDS= catch>0:devel/catch
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= 0b9ef3c0b
GH_TAGNAME= b57df1dcb
GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \
KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
KhronosGroup:Vulkan-Headers:v1.2.202:Vulkan_Headers/externals/Vulkan-Headers \
KhronosGroup:Vulkan-Headers:v1.3.213:Vulkan_Headers/externals/Vulkan-Headers \
MerryMage:dynarmic:r5-204-g57af72a5:dynarmic/externals/dynarmic \
ReinUsesLisp:sirit:b8f133b:sirit/externals/sirit \
ReinUsesLisp:sirit:aa292d5:sirit/externals/sirit \
arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
benhoyt:inih:r52:inih/externals/inih/inih \
fmtlib:fmt:8.0.0:fmt/externals/fmt \

View File

@ -1,18 +1,18 @@
TIMESTAMP = 1652305914
TIMESTAMP = 1652811000
SHA256 (yuzu/compatibility_list.json) = 6a73a63bb36c7070ec4314f4dfe61b244c819178e171254680aa43c2dfff187c
SIZE (yuzu/compatibility_list.json) = 1255189
SHA256 (yuzu-emu-yuzu-s20220511-0b9ef3c0b_GH0.tar.gz) = 081eafa8a027f3e3d1bd89b0a87874700ca1cefbdf87c1a4033822cc8b24f6c6
SIZE (yuzu-emu-yuzu-s20220511-0b9ef3c0b_GH0.tar.gz) = 4751456
SHA256 (yuzu-emu-yuzu-s20220517-b57df1dcb_GH0.tar.gz) = edda8b2366e5ff0da0238da83b22756db79a51949695e6edc6b9f36e33db8ceb
SIZE (yuzu-emu-yuzu-s20220517-b57df1dcb_GH0.tar.gz) = 4752052
SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450
SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189
SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = 403778
SHA256 (KhronosGroup-Vulkan-Headers-v1.2.202_GH0.tar.gz) = df8748ba3073be032f78c97994798c3c2b52b1812e506cc58855faf10f031226
SIZE (KhronosGroup-Vulkan-Headers-v1.2.202_GH0.tar.gz) = 1361825
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676
SIZE (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 1485380
SHA256 (MerryMage-dynarmic-r5-204-g57af72a5_GH0.tar.gz) = 07ae702968f6c953435d782ec0dfaa58831601b670b97616b094fade6fc7f0e4
SIZE (MerryMage-dynarmic-r5-204-g57af72a5_GH0.tar.gz) = 28341492
SHA256 (ReinUsesLisp-sirit-b8f133b_GH0.tar.gz) = 9bd4b11cb239f3ffe2f3da389d02e24d5926dbdc226f12d142ae872e83eee785
SIZE (ReinUsesLisp-sirit-b8f133b_GH0.tar.gz) = 23423
SHA256 (ReinUsesLisp-sirit-aa292d5_GH0.tar.gz) = 62efd50e59be5a3709dc69258b57c3796bb72ba25ad3e46bdb566c8c6bfc9878
SIZE (ReinUsesLisp-sirit-aa292d5_GH0.tar.gz) = 23507
SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58
SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240
SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880

View File

@ -1,39 +1,96 @@
PORTNAME= devilutionX
DISTVERSION= 1.2.1
PORTREVISION= 1
DISTVERSION= 1.4
CATEGORIES= games
MASTER_SITES= https://github.com/diasurgical/devilutionx-assets/releases/download/${DATA_VERSION}/:data
DISTFILES= devilutionx.mpq?tag=${DATA_VERSION}:data
EXTRACT_ONLY= ${DISTFILES:N*\:data:C/:.*//}
MAINTAINER= eduardo@FreeBSD.org
COMMENT= Diablo I engine for modern operating systems
LICENSE= UNLICENSE
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE= UNLICENSE CC-BY-NC-SA-4.0 OFL11
LICENSE_COMB= multi
LICENSE_FILE_UNLICENSE= ${WRKSRC}/LICENSE
_MY_DEPENDS= CharisSIL>0:x11-fonts/charis
BUILD_DEPENDS= ${_MY_DEPENDS}
LIB_DEPENDS= libsodium.so:security/libsodium
RUN_DEPENDS= ${_MY_DEPENDS}
LIB_DEPENDS= libfmt.so:devel/libfmt
USES= cmake compiler:c++11-lang dos2unix sdl
DOS2UNIX_GLOB= *.c *.h CMakeLists.txt
USES= cmake compiler:c++11-lang dos2unix gettext-tools pkgconfig sdl
DOS2UNIX_GLOB= *.cpp *.h CMakeLists.txt
USE_GITHUB= yes
GH_ACCOUNT= diasurgical
USE_SDL= mixer2 sdl2 ttf2
GH_TUPLE= diasurgical:libsmackerdec:2997ee0e41e91bb723003bc09234be553b190e38:libsmackerdec/_deps/libsmackerdec-src \
brofield:simpleini:9b3ed7ec815997bc8c5b9edf140d6bde653e1458:simpleini/_deps/simpleini-src \
diasurgical:libmpq:0f10bd1600f406b13932bf5351ba713361262184:libmpq/_deps/libmpq-src
USE_SDL= sdl2 image2
CMAKE_ARGS= -DCMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \
-DVERSION_NUM=${PORTVERSION}
-DVERSION_NUM="${PORTVERSION}.0"
CMAKE_ON= FETCHCONTENT_FULLY_DISCONNECTED
.if defined(WITH_DEBUG)
CMAKE_ON= DEBUG
.else
CMAKE_ON= BINARY_RELEASE
DATA_VERSION= v2
DATADIR= ${PREFIX}/share/diasurgical/devilutionx
OPTIONS_DEFINE= TEST SOUND LTO DEBUG
OPTIONS_GROUP= NETWORKING
OPTIONS_GROUP_NETWORKING= NETWORK TCP ZEROTIER ENCRYPTION
OPTIONS_DEFAULT= LTO NETWORK TCP ENCRYPTION SOUND
TEST_CMAKE_BOOL= BUILD_TESTING
TEST_BUILD_DEPENDS= googletest>0:devel/googletest
NETWORK_DESC= Enable network support
NETWORK_CMAKE_BOOL_OFF= NONET
TCP_DESC= TCP multiplayer option
TCP_CMAKE_BOOL_OFF= DISABLE_TCP
TCP_IMPLIES= NETWORK
TCP_GH_TUPLE= diasurgical:asio:ebeff99f539da23d27c2e8d4bdbc1ee011968644:asio/_deps/asio-src
ZEROTIER_DESC= ZeroTier multiplayer option (broken)
ZEROTIER_BROKEN= does not build: fatal error: 'sys/appleapiopts.h' file not found
ZEROTIER_CMAKE_BOOL_OFF=DISABLE_ZERO_TIER
ZEROTIER_IMPLIES= NETWORK
ZEROTIER_GH_TUPLE= diasurgical:libzt:a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02:libzt/_deps/libzt-src \
diasurgical:ZeroTierOne:b1350ac91118d1bd6bb71c0c41be5f4a30196838:ZeroTierOne/_deps/libzt-src/ext/ZeroTierOne \
diasurgical:lwip:1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b:lwip/_deps/libzt-src/ext/lwip \
diasurgical:lwip-contrib:1f9e26e221a41542563834222c4ec8399be1908f:lwipcontrib/_deps/libzt-src/ext/lwip-contrib
ENCRYPTION_DESC= Encrypt network packets
ENCRYPTION_CMAKE_BOOL= PACKET_ENCRYPTION
ENCRYPTION_IMPLIES= NETWORK
ENCRYPTION_LIB_DEPENDS= libsodium.so:security/libsodium
SOUND_CMAKE_BOOL_OFF= NOSOUND
SOUND_GH_TUPLE= realnc:SDL_audiolib:1a69135313c79817b38a3a99826d4ac28d627fdf:SDL_audiolib/_deps/sdl_audiolib-src
LTO_CMAKE_BOOL_OFF= DISABLE_LTO
DEBUG_CMAKE_BOOL= DEBUG
post-extract:
@${MKDIR} ${BUILD_WRKSRC}
@${LN} -s ${WRKSRC}/_deps ${BUILD_WRKSRC}/_deps
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Source/init.cpp
do-install:
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/devilutionx ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/Packaging/nix/devilutionx.desktop ${STAGEDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/Packaging/nix/devilutionx-hellfire.desktop ${STAGEDIR}${PREFIX}/share/applications
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
${INSTALL_DATA} ${WRKSRC}/Packaging/resources/icon.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/devilutionx.png
${INSTALL_DATA} ${WRKSRC}/Packaging/resources/hellfire.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/devilutionx-hellfire.png
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${DISTDIR}/devilutionx.mpq?tag=${DATA_VERSION} ${STAGEDIR}${DATADIR}/devilutionx.mpq
do-test-TEST-on:
@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/ctest -V
.if make(makesum)
GH_TUPLE+= ${TCP_GH_TUPLE} \
${ZEROTIER_GH_TUPLE} \
${SOUND_GH_TUPLE}
.endif
CXXFLAGS+= -DTTF_FONT_NAME=\\\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-Bold.ttf\\\"
PLIST_FILES= bin/devilutionx \
share/applications/devilutionx.desktop \
share/icons/hicolor/512x512/apps/devilutionx.png \
share/icons/hicolor/512x512/apps/devilutionx_solid.png
.include <bsd.port.mk>

View File

@ -1,3 +1,23 @@
TIMESTAMP = 1619323414
SHA256 (diasurgical-devilutionX-1.2.1_GH0.tar.gz) = 002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
SIZE (diasurgical-devilutionX-1.2.1_GH0.tar.gz) = 3573200
TIMESTAMP = 1652828881
SHA256 (devilutionx.mpq?tag=v2) = 90467c15f5e0ac902b2b8ac916f63a1fe2dd4b554ca36ab218bcd27f5121e988
SIZE (devilutionx.mpq?tag=v2) = 4959860
SHA256 (diasurgical-devilutionX-1.4_GH0.tar.gz) = 02efcb59c0b4c9f9332a93c9d9056d828381b261f00727d10e461b5b6a052c71
SIZE (diasurgical-devilutionX-1.4_GH0.tar.gz) = 7559966
SHA256 (diasurgical-libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38_GH0.tar.gz) = 40c0dc21943de22e153d56a7992c621a42a0c56c7cd833f8b84f90e48da753ea
SIZE (diasurgical-libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38_GH0.tar.gz) = 18556
SHA256 (brofield-simpleini-9b3ed7ec815997bc8c5b9edf140d6bde653e1458_GH0.tar.gz) = f7792eca9f3f7b0ee8916ffa4e124cb4b319b11d5849e15c5eef58eb910b0451
SIZE (brofield-simpleini-9b3ed7ec815997bc8c5b9edf140d6bde653e1458_GH0.tar.gz) = 62870
SHA256 (diasurgical-libmpq-0f10bd1600f406b13932bf5351ba713361262184_GH0.tar.gz) = ee173f5edb20f162482658cbc9d4bb84b640f651041d686c0ad7b2af12baf2a1
SIZE (diasurgical-libmpq-0f10bd1600f406b13932bf5351ba713361262184_GH0.tar.gz) = 69570
SHA256 (diasurgical-asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644_GH0.tar.gz) = 88bb72f7bbdde7dbd050789bd73ff2abb2e9eacd8f9c889202b502f222230b6e
SIZE (diasurgical-asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644_GH0.tar.gz) = 1614738
SHA256 (diasurgical-libzt-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02_GH0.tar.gz) = 40fd669e429b477bf2463e94c730b1db26752aafe06e4337dd76a112933ae1bf
SIZE (diasurgical-libzt-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02_GH0.tar.gz) = 390951
SHA256 (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 39c1b7e28f9d4d92edaaa831007715358465a068019fe84a56b5366b386a1363
SIZE (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 13122622
SHA256 (diasurgical-lwip-1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b_GH0.tar.gz) = 1477b5a427672480d0035b5af3e2cfae01c691afa9cace4500b43fcd262fa0bf
SIZE (diasurgical-lwip-1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b_GH0.tar.gz) = 1136882
SHA256 (diasurgical-lwip-contrib-1f9e26e221a41542563834222c4ec8399be1908f_GH0.tar.gz) = 0fd240b20ec56da41f5072161b8d1f1ad4367f994e183579bb5de9576394dcda
SIZE (diasurgical-lwip-contrib-1f9e26e221a41542563834222c4ec8399be1908f_GH0.tar.gz) = 395250
SHA256 (realnc-SDL_audiolib-1a69135313c79817b38a3a99826d4ac28d627fdf_GH0.tar.gz) = 8e013245bf8e676d4e2c61661d7cee6cb9de74f97a475c9e6b35a25d5e7a7715
SIZE (realnc-SDL_audiolib-1a69135313c79817b38a3a99826d4ac28d627fdf_GH0.tar.gz) = 304183

View File

@ -1,14 +1,10 @@
--- CMakeLists.txt.orig 2021-04-08 06:20:26 UTC
--- CMakeLists.txt.orig 2022-04-25 02:21:41 UTC
+++ CMakeLists.txt
@@ -873,6 +873,11 @@ if(CPACK)
set(CPACK_GENERATOR "DragNDrop")
endif()
@@ -156,7 +156,6 @@ if(NONET)
set(PACKET_ENCRYPTION OFF)
endif()
+install(TARGETS devilutionx DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES Packaging/fedora/devilutionx.desktop DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications)
+install(FILES Packaging/resources/icon.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/512x512/apps RENAME devilutionx.png)
+install(FILES Packaging/resources/icon_solid.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/512x512/apps RENAME devilutionx_solid.png)
+
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
endif()

View File

@ -1,17 +0,0 @@
--- Packaging/fedora/devilutionx.desktop.orig 2021-04-06 05:51:05 UTC
+++ Packaging/fedora/devilutionx.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
Name=DevilutionX
GenericName=DevilutionX
-Comment=Play Diablo I on Linux
-Comment[da]=Spil Diablo I på Linux
-Comment[hr]=Igrajte Diablo I na Linuxu
-Comment[it]=Gioca a Diablo I su Linux
+Comment=Play Diablo
+Comment[da]=Spil Diablo I
+Comment[hr]=Igrajte Diablo I
+Comment[it]=Gioca a Diablo I
Exec=devilutionx --diablo
Icon=devilutionx
Terminal=false

View File

@ -0,0 +1,14 @@
https://github.com/diasurgical/devilutionX/pull/4588
--- Source/engine/random.cpp.orig 2022-04-25 02:21:41 UTC
+++ Source/engine/random.cpp
@@ -29,7 +29,8 @@ uint32_t GetLCGEngineState()
int32_t GetRndSeed()
{
- return abs(static_cast<int32_t>(sglGameSeed));
+ const int32_t seed = static_cast<int32_t>(sglGameSeed);
+ return seed == -2147483648 ? -2147483648 : abs(seed);
}
int32_t AdvanceRndSeed()

View File

@ -0,0 +1,11 @@
--- Source/init.cpp.orig 2022-04-25 02:21:41 UTC
+++ Source/init.cpp
@@ -90,7 +90,7 @@ std::vector<std::string> GetMPQSearchPaths()
if (paths[0] == paths[1])
paths.pop_back();
-#if defined(__linux__) && !defined(__ANDROID__)
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__)
paths.emplace_back("/usr/share/diasurgical/devilutionx/");
paths.emplace_back("/usr/local/share/diasurgical/devilutionx/");
#elif defined(__3DS__) || defined(__SWITCH__)

View File

@ -0,0 +1,14 @@
--- Source/sound.h.orig 2022-05-17 15:57:06 UTC
+++ Source/sound.h
@@ -60,7 +60,11 @@ struct TSnd {
};
extern bool gbSndInited;
+#ifndef NOSOUND
extern _music_id sgnMusicTrack;
+#else
+inline const _music_id sgnMusicTrack = NUM_MUSIC;
+#endif
void ClearDuplicateSounds();
void snd_stop_snd(TSnd *pSnd);

View File

@ -4,8 +4,7 @@
This game requires a datafile from the original Diablo(tm) CD or the GOG release.
If you don't own it yet, you can buy it at https://www.gog.com/game/diablo
Copy DIABDAT.MPQ to ~/.local/share/diasurgical/devilution/diabdat.mpq
Pay attention to the case, the resulting file needs to be entirely lowercase!
Copy DIABDAT.MPQ to ~/.local/share/diasurgical/devilution/
If you have any issues with this game, please file a bug report on the GitHub page:
https://github.com/diasurgical/devilutionX/issues

View File

@ -0,0 +1,6 @@
bin/devilutionx
share/applications/devilutionx-hellfire.desktop
share/applications/devilutionx.desktop
%%DATADIR%%/devilutionx.mpq
share/icons/hicolor/512x512/apps/devilutionx-hellfire.png
share/icons/hicolor/512x512/apps/devilutionx.png

View File

@ -1,7 +1,7 @@
PORTNAME= libavif
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

View File

@ -1,6 +1,6 @@
PORTNAME= mesa
DISTVERSION= 22.1-branchpoint-1527
DISTVERSIONSUFFIX= -g65fce0f813e
DISTVERSION= 22.1-branchpoint-1780
DISTVERSIONSUFFIX= -gbe5c7c0351e
CATEGORIES= graphics
PKGNAMESUFFIX= -devel

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1652483896
SHA256 (mesa3d-mesa-22.1-branchpoint-1527-g65fce0f813e_GH0.tar.gz) = f3c1d82cb2f585974fd0cdd062bfa4dedb917536684f0d0a999e69358e7addec
SIZE (mesa3d-mesa-22.1-branchpoint-1527-g65fce0f813e_GH0.tar.gz) = 24806577
TIMESTAMP = 1652897006
SHA256 (mesa3d-mesa-22.1-branchpoint-1780-gbe5c7c0351e_GH0.tar.gz) = c5e2478cceadf3683c5a933ff7eddc97af2b3d276c62df06e00636a68f83905c
SIZE (mesa3d-mesa-22.1-branchpoint-1780-gbe5c7c0351e_GH0.tar.gz) = 24920547
SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5
SIZE (700efacda59c.patch) = 981
SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470

View File

@ -1,6 +1,6 @@
PORTNAME= vulkan-extension-layer
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.212
DISTVERSION= 1.3.214
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1650641112
SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.212_GH0.tar.gz) = 5776cb470fd14413401373a0494b74444eb90a415a440474f20c4f8b511586bc
SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.212_GH0.tar.gz) = 467443
TIMESTAMP = 1652811715
SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.214_GH0.tar.gz) = b731ee730a39659acead3b530f2db87fea2af5235ac0b55f827f971acdbd3ace
SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.214_GH0.tar.gz) = 472001

View File

@ -1,6 +1,6 @@
PORTNAME= vulkan-headers
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.213
DISTVERSION= 1.3.214
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1652178699
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676
SIZE (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 1485380
TIMESTAMP = 1652798406
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.214_GH0.tar.gz) = 4b16611b5f8e48a3e30a8e5a1bc149110bd5e1b3d49f79f3992d07e7e0627d1e
SIZE (KhronosGroup-Vulkan-Headers-v1.3.214_GH0.tar.gz) = 1488569

View File

@ -1,6 +1,6 @@
PORTNAME= vulkan-loader
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.213
DISTVERSION= 1.3.214
CATEGORIES= graphics devel
MAINTAINER= jbeich@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1652290262
SHA256 (KhronosGroup-Vulkan-Loader-v1.3.213_GH0.tar.gz) = 3cacac2a39026ce74ff96d2bf5d2c85f2729218182cf0be07ae62f58a5301a39
SIZE (KhronosGroup-Vulkan-Loader-v1.3.213_GH0.tar.gz) = 1587161
TIMESTAMP = 1652802182
SHA256 (KhronosGroup-Vulkan-Loader-v1.3.214_GH0.tar.gz) = cc1a0075f95f69b30959f93703b7eba69e31cc9c9551de7da213fc6636699f1b
SIZE (KhronosGroup-Vulkan-Loader-v1.3.214_GH0.tar.gz) = 1587154

View File

@ -1,4 +1,4 @@
lib/libvulkan.so
lib/libvulkan.so.1
lib/libvulkan.so.1.3.213
lib/libvulkan.so.1.3.214
libdata/pkgconfig/vulkan.pc

View File

@ -1,12 +1,8 @@
PORTNAME= vulkan-tools
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.213
PORTREVISION= 1
DISTVERSION= 1.3.214
CATEGORIES= graphics
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= fbb147443834.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/650
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Tools and demos for the Vulkan graphics API

View File

@ -1,5 +1,3 @@
TIMESTAMP = 1652295374
SHA256 (KhronosGroup-Vulkan-Tools-v1.3.213_GH0.tar.gz) = 2b20b9c8cefe26f8d7df5f6b270c6a6d4dcf5fe0995f779abac2f0fa658c5798
SIZE (KhronosGroup-Vulkan-Tools-v1.3.213_GH0.tar.gz) = 865441
SHA256 (fbb147443834.patch) = c1e2d22b1cc28e4ce0b5d78a2cd231fe87a6440b5119017950f5837ad7ef2f5b
SIZE (fbb147443834.patch) = 1233
TIMESTAMP = 1652804321
SHA256 (KhronosGroup-Vulkan-Tools-v1.3.214_GH0.tar.gz) = fc2b962ba9b386fd0e5ddb0af9b227d899319c7764d3c7c3479880007e17d745
SIZE (KhronosGroup-Vulkan-Tools-v1.3.214_GH0.tar.gz) = 865754

View File

@ -1,6 +1,6 @@
PORTNAME= vulkan-validation-layers
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.213
DISTVERSION= 1.3.214
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1652318561
SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.213_GH0.tar.gz) = 26199bde8d7c499867d2fde95aea139815d30fd8a3548d95ebd401224a8ce02c
SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.213_GH0.tar.gz) = 4001934
TIMESTAMP = 1652826534
SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.214_GH0.tar.gz) = b5e99769238d1a11ed0e2b21e5069505230275ae97510a24cd90725aa04a7ca0
SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.214_GH0.tar.gz) = 4006598
SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-166-gb765c35_GH0.tar.gz) = 6a5ff07982c9ef1d5b11c7cedfae9bd0b823a5f5fc0a3f6e74d02a402b08d16e
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-166-gb765c35_GH0.tar.gz) = 420996
SHA256 (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0

View File

@ -1,6 +1,6 @@
PORTNAME= catgirl
PORTVERSION= 2.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= irc
MASTER_SITES= https://git.causal.agency/catgirl/snapshot/

View File

@ -1,6 +1,6 @@
PORTNAME= pounce
DISTVERSION= 3.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= irc
MASTER_SITES= https://git.causal.agency/pounce/snapshot/

View File

@ -20,11 +20,12 @@ TEST_BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit \
MAKE_ENV+= JAVA_HOME=${JAVA_HOME} OPSYS=${OPSYS}
PLIST_FILES= %%JAVAJARDIR%%/JXGrabKey.jar lib/libJXGrabKey.so
USE_LDCONFIG= yes
ANT_ARGS= -Djavac.source=1.7 -Djavac.target=1.7
do-build:
${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC}/JXGrabKey/C++ \
-f ${FILESDIR}/Makefile.JXGrabKey libJXGrabKey.so
cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar
cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar ${ANT_ARGS}
do-install:
${INSTALL_LIB} ${WRKSRC}/JXGrabKey/C++/libJXGrabKey.so ${STAGEDIR}${PREFIX}/lib/
@ -36,6 +37,7 @@ do-test-TEST-on: build
${SETENV} CLASSPATH=${JAVALIBDIR}/junit.jar:${JAVALIBDIR}/hamcrest.jar \
LD_LIBRARY_PATH=${WRKSRC}/JXGrabKey/C++ \
${ANT} -Djavac.classpath=${JAVALIBDIR}/junit.jar \
${ANT_ARGS} \
test
.include <bsd.port.mk>

View File

@ -59,6 +59,7 @@
SUBDIR += erlang-runtime22
SUBDIR += erlang-runtime23
SUBDIR += erlang-runtime24
SUBDIR += erlang-runtime25
SUBDIR += erlang-wx
SUBDIR += execline
SUBDIR += expect

View File

@ -1,7 +1,7 @@
# Created by: ruslan@shevchenko.kiev.ua
PORTNAME= erlang
PORTVERSION= 24.2
PORTVERSION= 24.3
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1639586255
SHA256 (erlang/otp_doc_html_24.2.tar.gz) = f479cbc8a28532fd6a0a55fc26684b4e79312da4f86ee0735d0757f936672bbc
SIZE (erlang/otp_doc_html_24.2.tar.gz) = 36604264
TIMESTAMP = 1652901914
SHA256 (erlang/otp_doc_html_24.3.tar.gz) = 7a247113a0f90514aacb0656e98a1e4d63e2ebf4ac9981002d046599147dc177
SIZE (erlang/otp_doc_html_24.3.tar.gz) = 36645792
SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b

View File

@ -155,34 +155,6 @@
%%DOCSDIR%%/html/doc/tutorial/port_driver.c
%%DOCSDIR%%/html/doc/tutorial/port_driver.gif
%%DOCSDIR%%/html/doc/tutorial/users_guide.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter.eix
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_app.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_codec.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_dict.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_examples.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_intro.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_make.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_sctp.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_soc.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_tcp.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_transport.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameter_using.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/diameterc.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/index.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/notes.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/release_notes.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/html/users_guide.html
%%DOCSDIR%%/html/lib/diameter-2.2.4/doc/pdf/diameter-2.2.4.pdf
%%DOCSDIR%%/html/lib/diameter-2.2.4/info
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/html/eldap.eix
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/html/eldap.html
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/html/index.html
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/html/notes.html
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/html/release_notes.html
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/html/users_guide.html
%%DOCSDIR%%/html/lib/eldap-1.2.9/doc/pdf/eldap-1.2.9.pdf
%%DOCSDIR%%/html/lib/eldap-1.2.9/info
%%DOCSDIR%%/html/lib/et-1.6.5/doc/html/coffee_order.png
%%DOCSDIR%%/html/lib/et-1.6.5/doc/html/et.eix
%%DOCSDIR%%/html/lib/et-1.6.5/doc/html/et.html

View File

@ -1,5 +1,5 @@
PORTNAME= erlang
PORTVERSION= 24.2
PORTVERSION= 24.3
PORTREVISION= 0
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1639586331
SHA256 (erlang/otp_doc_man_24.2.tar.gz) = 56ae4b13fc7c003f4dd9951a9ff2a0bae0b38473df2c078d79c8553c277c5f4c
SIZE (erlang/otp_doc_man_24.2.tar.gz) = 1673926
TIMESTAMP = 1652901744
SHA256 (erlang/otp_doc_man_24.3.tar.gz) = 68ad2222eef77310c286411ad0e580865f3ba273e9fe42516ade0e5310cff614
SIZE (erlang/otp_doc_man_24.3.tar.gz) = 1680242

View File

@ -0,0 +1,155 @@
PORTNAME= erlang
DISTVERSIONPREFIX= OTP-
DISTVERSION= 25.0
PORTREVISION= 0
CATEGORIES= lang parallel java
PKGNAMESUFFIX= -runtime25
DIST_SUBDIR= erlang
MAINTAINER= erlang@FreeBSD.org
COMMENT= Functional programming language from Ericsson
LICENSE= APACHE20
BROKEN_sparc64= Fails to build: error: fp_except undeclared
USES= cpe gmake ncurses perl5
CPE_VENDOR= erlang
CPE_PRODUCT= erlang/otp
USE_GITHUB= nodefault
GH_ACCOUNT= erlang:otp,corba
GH_PROJECT= otp:otp corba:corba
GH_TAGNAME= 5.1:corba
USE_PERL5= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-dirty-schedulers \
--enable-kernel-poll \
--enable-smp-support \
--enable-threads
MAKE_ARGS= all
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
SUB_FILES= pkg-message
SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
WRKSRC= ${WRKSRC_otp}
ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
OPTIONS_DEFINE= CHUNKS CORBA DTRACE JAVA KQUEUE ODBC OPENSSL SCTP \
SHARING WX
OPTIONS_DEFAULT= CHUNKS CORBA DTRACE KQUEUE OPENSSL SCTP SHARING
.if !exists(/usr/sbin/dtrace)
OPTIONS_EXCLUDE+= DTRACE
.endif
OPTIONS_EXCLUDE_DragonFly= SCTP
# ld(1) fails to link probes: missing __dtrace_erlang___* symbols
# see also https://reviews.freebsd.org/D22360
OPTIONS_EXCLUDE_aarch64= DTRACE
OPTIONS_EXCLUDE_armv6= DTRACE
OPTIONS_EXCLUDE_armv7= DTRACE
OPTIONS_EXCLUDE_i386= DTRACE
OPTIONS_EXCLUDE_riscv64= DTRACE
CHUNKS_DESC= Enable in-line documentation in Erlang console
CORBA_DESC= Enable Corba support
KQUEUE_DESC= Enable Kernel Poll (kqueue) support
SCTP_DESC= Enable SCTP support
SHARING_DESC= Enable term copy-and-share support
WX_DESC= Enable WX application
# If you run Erlang and get a message resembling "WARNING: number of
# probes fixed does not match the number of defined probes (54 != 132,
# respectively)" you probably misconfigured DTrace in some way.
CHUNKS_MAKE_ARGS+= docs DOC_TARGETS=chunks
DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace
DTRACE_CFLAGS= -fno-omit-frame-pointer
DTRACE_VARS= STRIP=""
JAVA_CONFIGURE_WITH= javac
JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}"
JAVA_VARS= USE_JAVA=yes
KQUEUE_CONFIGURE_ENABLE= kernel-poll
ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
ODBC_USES= localbase
ODBC_CONFIGURE_WITH= odbc
ODBC_CFLAGS= -I/usr/local/include
ODBC_LDFLAGS= -L/usr/local/lib
OPENSSL_USES= ssl
OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE}
SCTP_CONFIGURE_ENABLE= sctp
SHARING_CONFIGURE_ENABLE= sharing-preserving
WX_USES= gl
WX_CONFIGURE_WITH= wx-config=${WX_CONFIG}
WX_VARS= USE_GL="gl glu" \
USE_WX=3.1+ \
WX_COMPS="wx"
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD
CFLAGS+= -DMAP_NORESERVE=0
.endif
.if ${ARCH} == i386
MAKE_ARGS+= ARCH=x86
.endif
.if ${ARCH} == armv6 || ${ARCH} == armv7
MAKE_ARGS+= ARCH=arm
.endif
pre-configure-WX-off:
echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP
echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP
echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP
echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
post-configure-ODBC-on:
${RM} ${WRKSRC}/lib/odbc/SKIP
post-configure-ODBC-off:
echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP
post-build-CORBA-on:
cd ${WRKSRC_corba} \
&& ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} ${MAKE_CMD}
post-install-CORBA-on:
cd ${WRKSRC_corba} \
&& ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \
${MAKE_CMD} release RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
post-install-DTRACE-on:
${MKDIR} ${STAGEDIR}${DATADIR}/dtrace
${INSTALL_DATA} ${WRKSRC}/erts/emulator/beam/*.d \
${WRKSRC}/lib/runtime_tools/c_src/*.d \
${WRKSRC}/lib/runtime_tools/examples/*.d \
${STAGEDIR}${DATADIR}/dtrace
post-install-JAVA-off:
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
post-install-ODBC-off:
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
post-install-OPENSSL-off:
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
post-install-WX-off:
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/debugger-*
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/et-*
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-*
${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
post-stage:
${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* ${DATADIR_REL}/* -type f -o -type l \
| ${SORT} >> ${TMPPLIST}
.include <bsd.port.post.mk>

View File

@ -0,0 +1,5 @@
TIMESTAMP = 1652882018
SHA256 (erlang/erlang-otp-OTP-25.0_GH0.tar.gz) = 5988e3bca208486494446e885ca2149fe487ee115cbc3770535fd22a795af5d2
SIZE (erlang/erlang-otp-OTP-25.0_GH0.tar.gz) = 59574655
SHA256 (erlang/erlang-corba-5.1_GH0.tar.gz) = 03497d71098c474b330794dd523ef19ef20a47c0e2d441009d6cf929455c468f
SIZE (erlang/erlang-corba-5.1_GH0.tar.gz) = 1392861

View File

@ -0,0 +1,20 @@
--- Makefile.in.orig 2015-06-23 18:56:21 UTC
+++ Makefile.in
@@ -60,7 +60,7 @@ bindir = @bindir@
libdir = @libdir@
# Where Erlang/OTP is located
-libdir_suffix = /erlang
+libdir_suffix = /erlang25
erlang_libdir = $(libdir)$(libdir_suffix)
erlang_bindir = $(erlang_libdir)/bin
@@ -1013,7 +1013,7 @@ $(TEST_DIRS):
#
# Order is important here, don't change it!
#
-INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin
+INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version
install: $(INST_DEP)

View File

@ -0,0 +1,12 @@
--- erts/etc/unix/run_erl.c.orig 2015-03-31 12:32:52 UTC
+++ erts/etc/unix/run_erl.c
@@ -73,9 +73,6 @@
#ifdef HAVE_UTMP_H
# include <utmp.h>
#endif
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif

View File

@ -0,0 +1,11 @@
--- lib/crypto/c_src/Makefile.in.orig 2021-05-27 09:40:45 UTC
+++ lib/crypto/c_src/Makefile.in
@@ -136,7 +136,7 @@ endif
endif
ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else

View File

@ -0,0 +1,26 @@
--- lib/stdlib/src/calendar.erl.orig 2015-03-31 12:32:52 UTC
+++ lib/stdlib/src/calendar.erl
@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I
DateTime1 :: datetime1970(),
DateTime :: datetime1970().
local_time_to_universal_time_dst(DateTime) ->
- UtDst = erlang:localtime_to_universaltime(DateTime, true),
- Ut = erlang:localtime_to_universaltime(DateTime, false),
%% Reverse check the universal times
- LtDst = erlang:universaltime_to_localtime(UtDst),
- Lt = erlang:universaltime_to_localtime(Ut),
+ {UtDst, LtDst} =
+ try
+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true),
+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)}
+ catch error:badarg -> {error, error}
+ end,
+ {Ut, Lt} =
+ try
+ Ut0 = erlang:localtime_to_universaltime(DateTime, false),
+ {Ut0, erlang:universaltime_to_localtime(Ut0)}
+ catch error:badarg -> {error, error}
+ end,
%% Return the valid universal times
case {LtDst,Lt} of
{DateTime,DateTime} when UtDst =/= Ut ->

View File

@ -0,0 +1,8 @@
[
{ type: install
message: <<EOM
To use this runtime port for development or testing, just prepend
its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable.
EOM
}
]

View File

@ -0,0 +1,10 @@
Erlang is a programming language used to build massively scalable soft
real-time systems with requirements on high availability. Some of its
uses are in telecoms, banking, e-commerce, computer telephony and
instant messaging. Erlang's runtime system has built-in support for
concurrency, distribution and fault tolerance.
This port contains a standalone runtime environment of Erlang 25
to be used during the development of OTP applications.
WWW: https://www.erlang.org/

View File

@ -2,7 +2,7 @@
PORTNAME= mpop
DISTVERSION= 1.4.16
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://marlam.de/mpop/releases/

View File

@ -289,6 +289,7 @@
SUBDIR += eigen3
SUBDIR += eispack
SUBDIR += elemental
SUBDIR += elementary-calculator
SUBDIR += elpa
SUBDIR += emc2
SUBDIR += ensmallen
@ -764,7 +765,6 @@
SUBDIR += p5-Text-AsciiTeX
SUBDIR += p5-bignum
SUBDIR += palp
SUBDIR += pantheon-calculator
SUBDIR += pari
SUBDIR += pari_elldata
SUBDIR += pari_galdata

View File

@ -1,8 +1,7 @@
PORTNAME= calculator
PORTVERSION= 1.7.2
DISTVERSION= 2.0.0
CATEGORIES= math
PKGNAMEPREFIX= pantheon-
DIST_SUBDIR= pantheon
PKGNAMEPREFIX= elementary-
MAINTAINER= duchateau.olivier@gmail.com
COMMENT= Simple calculator written in Vala
@ -12,15 +11,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgranite.so:x11-toolkits/granite \
libgranite-7.so:x11-toolkits/granite7 \
libhandy-1.so:x11-toolkits/libhandy
USES= gettext gnome meson pkgconfig python:3.6+,build
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30
USE_GITHUB= yes
GH_ACCOUNT= elementary
USE_GNOME= cairo gdkpixbuf2 glib20 gtk40
GLIB_SCHEMAS= io.elementary.calculator.gschema.xml
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1652373931
SHA256 (elementary-calculator-2.0.0_GH0.tar.gz) = bf4fefc9a526ad9e7c546374e764473e75aed77822bd0d3f7b706017181a4f1d
SIZE (elementary-calculator-2.0.0_GH0.tar.gz) = 232133

View File

@ -0,0 +1,28 @@
Replace missing icons (Adwaita)
--- src/MainWindow.vala.orig 2022-05-10 20:12:35 UTC
+++ src/MainWindow.vala
@@ -78,7 +78,7 @@ public class PantheonCalculator.MainWindow : Gtk.Appli
history = new List<History?> ();
position = 0;
button_extended = new Gtk.ToggleButton () {
- icon_name = "pane-hide-symbolic",
+ icon_name = "pan-end-symbolic",
tooltip_text = _("Show extended functionality")
};
button_extended.toggled.connect (toggle_grid);
@@ -731,12 +731,12 @@ public class PantheonCalculator.MainWindow : Gtk.Appli
position = entry.get_position ();
if (button.get_active ()) {
/* Show extended functionality */
- button.icon_name = "pane-show-symbolic";
+ button.icon_name = "pan-start-symbolic";
button.tooltip_text = _("Hide extended functionality");
extended_revealer.reveal_child = true;
} else {
/* Hide extended functionality */
- button.icon_name = "pane-hide-symbolic";
+ button.icon_name = "pan-end-symbolic";
button.tooltip_text = _("Show extended functionality");
extended_revealer.reveal_child = false;
}

View File

@ -6,6 +6,10 @@ PORTREVISION= 15
CATEGORIES= math kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
PATCH_SITES= https://invent.kde.org/education/labplot/-/commit/
PATCHFILES= 375786ca124a1a6773c609236f8341890f23e1d8.diff:-p1 \
9e77b593030fdae0fbbad113415483b3ca51a654.diff:-p1
MAINTAINER= kde@FreeBSD.org
COMMENT= Data plotting and function analysis tool by KDE

View File

@ -1,3 +1,7 @@
TIMESTAMP = 1620556356
TIMESTAMP = 1652900652
SHA256 (labplot-2.8.2.tar.xz) = 8ec581da971735bfab20c28b1a7507196bf102a991d895bb1ec892c521b31dfa
SIZE (labplot-2.8.2.tar.xz) = 13235168
SHA256 (375786ca124a1a6773c609236f8341890f23e1d8.diff) = cf726e1d5f814fa5d85c0ba0e4792b3fa879978f9f5564dabee0d0ae0e4dedc8
SIZE (375786ca124a1a6773c609236f8341890f23e1d8.diff) = 2210
SHA256 (9e77b593030fdae0fbbad113415483b3ca51a654.diff) = 350d9d2a8a79938dd9cba5b0e2e4246c1f4d90a3dc0fc8b5a09240bc85f7ec36
SIZE (9e77b593030fdae0fbbad113415483b3ca51a654.diff) = 1620

View File

@ -1,6 +1,6 @@
PORTNAME= lean
DISTVERSIONPREFIX= v
DISTVERSION= 3.42.1
DISTVERSION= 3.43.0
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1648348914
SHA256 (leanprover-community-lean-v3.42.1_GH0.tar.gz) = 5b8cbfdea6cf4de5488467297958876aa0b3a79ed5806f7d0f01a0c396beb4e2
SIZE (leanprover-community-lean-v3.42.1_GH0.tar.gz) = 1908398
TIMESTAMP = 1652900392
SHA256 (leanprover-community-lean-v3.43.0_GH0.tar.gz) = e48beb00b823ae2dfc90841a0f413df1a11260de7ab47878153bc570c9335f75
SIZE (leanprover-community-lean-v3.43.0_GH0.tar.gz) = 1909158

View File

@ -1,3 +0,0 @@
TIMESTAMP = 1639672237
SHA256 (pantheon/elementary-calculator-1.7.2_GH0.tar.gz) = d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b
SIZE (pantheon/elementary-calculator-1.7.2_GH0.tar.gz) = 229144

View File

@ -1,15 +0,0 @@
Replace missing icons (Adwaita)
--- src/MainWindow.vala.orig 2016-08-10 05:29:30 UTC
+++ src/MainWindow.vala
@@ -73,8 +73,8 @@ namespace PantheonCalculator {
headerbar.set_title (_("Calculator"));
set_titlebar (headerbar);
- extended_img_1 = new Gtk.Image.from_icon_name ("pane-hide-symbolic", Gtk.IconSize.MENU);
- extended_img_2 = new Gtk.Image.from_icon_name ("pane-show-symbolic", Gtk.IconSize.MENU);
+ extended_img_1 = new Gtk.Image.from_icon_name ("pan-end-symbolic", Gtk.IconSize.MENU);
+ extended_img_2 = new Gtk.Image.from_icon_name ("pan-start-symbolic", Gtk.IconSize.MENU);
button_extended = new Gtk.ToggleButton ();
button_extended.image = extended_img_1;

View File

@ -9,13 +9,6 @@ USES= cmake kde:5 qt:5 tar:xz
USE_KDE= ecm
USE_QT= buildtools_build qmake_build
# The qmake dependency is only needed so that kf5-e-c-m can query qmake for
# some installation directories.
# We explicitly prevent it from looking for qt5-core and specify qmake's path
# to avoid needlessly depending on qt5-core.
CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=TRUE \
-DQMAKE_EXECUTABLE:PATH=${QMAKE}
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>

View File

@ -2,7 +2,7 @@
PORTNAME= ffmpeg
PORTVERSION= 4.4.2
PORTREVISION= 1
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/

View File

@ -10,6 +10,10 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/50bc87263576
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d794b36a7788
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/6fd1533057ff
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ded0334d214f
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/70887d44ffa3
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7
--- configure.orig 2021-10-24 20:47:11 UTC
+++ configure
@ -103,14 +107,12 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
} SvtContext;
static const struct {
@@ -151,49 +154,62 @@ static int config_enc_params(EbSvtAv1EncConfiguration
@@ -151,11 +154,126 @@ static int config_enc_params(EbSvtAv1EncConfiguration
{
SvtContext *svt_enc = avctx->priv_data;
const AVPixFmtDescriptor *desc;
+ AVDictionaryEntry *en = NULL;
- param->source_width = avctx->width;
- param->source_height = avctx->height;
+ // Update param from options
+#if FF_API_SVTAV1_OPTS
+ param->hierarchical_levels = svt_enc->hierarchical_level;
@ -118,22 +120,11 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
+ param->scene_change_detection = svt_enc->scd;
+ param->tile_columns = svt_enc->tile_columns;
+ param->tile_rows = svt_enc->tile_rows;
- desc = av_pix_fmt_desc_get(avctx->pix_fmt);
- param->encoder_bit_depth = desc->comp[0].depth;
+
+ if (svt_enc->la_depth >= 0)
+ param->look_ahead_distance = svt_enc->la_depth;
+#endif
- if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 1)
- param->encoder_color_format = EB_YUV420;
- else if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 0)
- param->encoder_color_format = EB_YUV422;
- else if (!desc->log2_chroma_w && !desc->log2_chroma_h)
- param->encoder_color_format = EB_YUV444;
- else {
- av_log(avctx, AV_LOG_ERROR , "Unsupported pixel format\n");
- return AVERROR(EINVAL);
+
+ if (svt_enc->enc_mode >= 0)
+ param->enc_mode = svt_enc->enc_mode;
+
@ -146,10 +137,10 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
+
+ param->max_qp_allowed = avctx->qmax;
+ param->min_qp_allowed = avctx->qmin;
}
+ }
+ param->max_bit_rate = avctx->rc_max_rate;
+ param->vbv_bufsize = avctx->rc_buffer_size;
+
+ if (svt_enc->crf > 0) {
+ param->qp = svt_enc->crf;
+ param->rate_control_mode = 0;
@ -170,41 +161,50 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
+ else
+ param->color_range = !!(desc->flags & AV_PIX_FMT_FLAG_RGB);
+
if (avctx->profile != FF_PROFILE_UNKNOWN)
param->profile = avctx->profile;
if (avctx->level != FF_LEVEL_UNKNOWN)
param->level = avctx->level;
- if ((param->encoder_color_format == EB_YUV422 || param->encoder_bit_depth > 10)
- && param->profile != FF_PROFILE_AV1_PROFESSIONAL ) {
- av_log(avctx, AV_LOG_WARNING, "Forcing Professional profile\n");
- param->profile = FF_PROFILE_AV1_PROFESSIONAL;
- } else if (param->encoder_color_format == EB_YUV444 && param->profile != FF_PROFILE_AV1_HIGH) {
- av_log(avctx, AV_LOG_WARNING, "Forcing High profile\n");
- param->profile = FF_PROFILE_AV1_HIGH;
- }
-
- // Update param from options
- param->hierarchical_levels = svt_enc->hierarchical_level;
- param->enc_mode = svt_enc->enc_mode;
- param->tier = svt_enc->tier;
- param->rate_control_mode = svt_enc->rc_mode;
- param->scene_change_detection = svt_enc->scd;
- param->qp = svt_enc->qp;
-
- param->target_bit_rate = avctx->bit_rate;
-
if (avctx->gop_size > 0)
param->intra_period_length = avctx->gop_size - 1;
@@ -205,19 +221,56 @@ static int config_enc_params(EbSvtAv1EncConfiguration
param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame;
}
- if (param->rate_control_mode) {
- param->max_qp_allowed = avctx->qmax;
- param->min_qp_allowed = avctx->qmin;
+#if SVT_AV1_CHECK_VERSION(1, 0, 0)
+ if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) {
+ const char *name =
+ av_chroma_location_name(avctx->chroma_sample_location);
+
+ switch (avctx->chroma_sample_location) {
+ case AVCHROMA_LOC_LEFT:
+ param->chroma_sample_position = EB_CSP_VERTICAL;
+ break;
+ case AVCHROMA_LOC_TOPLEFT:
+ param->chroma_sample_position = EB_CSP_COLOCATED;
+ break;
+ default:
+ if (!name)
+ break;
+
+ av_log(avctx, AV_LOG_WARNING,
+ "Specified chroma sample location %s is unsupported "
+ "on the AV1 bit stream level. Usage of a container that "
+ "allows passing this information - such as Matroska - "
+ "is recommended.\n",
+ name);
+ break;
+ }
+ }
+#endif
+
+ if (avctx->profile != FF_PROFILE_UNKNOWN)
+ param->profile = avctx->profile;
+
+ if (avctx->level != FF_LEVEL_UNKNOWN)
+ param->level = avctx->level;
+
+ if (avctx->gop_size > 0)
+ param->intra_period_length = avctx->gop_size - 1;
+
+ if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
+ param->frame_rate_numerator = avctx->framerate.num;
+ param->frame_rate_denominator = avctx->framerate.den;
+ } else {
+ param->frame_rate_numerator = avctx->time_base.den;
+ param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame;
+ }
+
+ /* 2 = IDR, closed GOP, 1 = CRA, open GOP */
+ param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1;
+
@ -217,7 +217,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR(EINVAL);
+ }
}
+ }
+#else
+ if ((en = av_dict_get(svt_enc->svtav1_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
+ int level = (avctx->err_recognition & AV_EF_EXPLODE) ? AV_LOG_ERROR : AV_LOG_WARNING;
@ -227,43 +227,97 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
+ return AVERROR(ENOSYS);
+ }
+#endif
+
param->source_width = avctx->width;
param->source_height = avctx->height;
- desc = av_pix_fmt_desc_get(avctx->pix_fmt);
param->encoder_bit_depth = desc->comp[0].depth;
if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 1)
@@ -169,12 +287,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration
return AVERROR(EINVAL);
}
- if (avctx->profile != FF_PROFILE_UNKNOWN)
- param->profile = avctx->profile;
-
- if (avctx->level != FF_LEVEL_UNKNOWN)
- param->level = avctx->level;
-
if ((param->encoder_color_format == EB_YUV422 || param->encoder_bit_depth > 10)
&& param->profile != FF_PROFILE_AV1_PROFESSIONAL ) {
av_log(avctx, AV_LOG_WARNING, "Forcing Professional profile\n");
@@ -184,40 +296,21 @@ static int config_enc_params(EbSvtAv1EncConfiguration
param->profile = FF_PROFILE_AV1_HIGH;
}
- // Update param from options
- param->hierarchical_levels = svt_enc->hierarchical_level;
- param->enc_mode = svt_enc->enc_mode;
- param->tier = svt_enc->tier;
- param->rate_control_mode = svt_enc->rc_mode;
- param->scene_change_detection = svt_enc->scd;
- param->qp = svt_enc->qp;
+ avctx->bit_rate = param->rate_control_mode > 0 ?
+ param->target_bit_rate : 0;
+ avctx->rc_max_rate = param->max_bit_rate;
+ avctx->rc_buffer_size = param->vbv_bufsize;
- param->target_bit_rate = avctx->bit_rate;
+ if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
+ AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
+ if (!cpb_props)
+ return AVERROR(ENOMEM);
- if (avctx->gop_size > 0)
- param->intra_period_length = avctx->gop_size - 1;
-
- if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
- param->frame_rate_numerator = avctx->framerate.num;
- param->frame_rate_denominator = avctx->framerate.den;
- } else {
- param->frame_rate_numerator = avctx->time_base.den;
- param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame;
+ cpb_props->buffer_size = avctx->rc_buffer_size;
+ cpb_props->max_bitrate = avctx->rc_max_rate;
+ cpb_props->avg_bitrate = avctx->bit_rate;
}
- if (param->rate_control_mode) {
- param->max_qp_allowed = avctx->qmax;
- param->min_qp_allowed = avctx->qmin;
- }
-
- param->intra_refresh_type = 2; /* Real keyframes only */
+ param->source_width = avctx->width;
+ param->source_height = avctx->height;
-
- if (svt_enc->la_depth >= 0)
- param->look_ahead_distance = svt_enc->la_depth;
+ param->encoder_bit_depth = desc->comp[0].depth;
-
- param->tile_columns = svt_enc->tile_columns;
- param->tile_rows = svt_enc->tile_rows;
+ if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 1)
+ param->encoder_color_format = EB_YUV420;
+ else if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 0)
+ param->encoder_color_format = EB_YUV422;
+ else if (!desc->log2_chroma_w && !desc->log2_chroma_h)
+ param->encoder_color_format = EB_YUV444;
+ else {
+ av_log(avctx, AV_LOG_ERROR , "Unsupported pixel format\n");
+ return AVERROR(EINVAL);
+ }
+ if ((param->encoder_color_format == EB_YUV422 || param->encoder_bit_depth > 10)
+ && param->profile != FF_PROFILE_AV1_PROFESSIONAL ) {
+ av_log(avctx, AV_LOG_WARNING, "Forcing Professional profile\n");
+ param->profile = FF_PROFILE_AV1_PROFESSIONAL;
+ } else if (param->encoder_color_format == EB_YUV444 && param->profile != FF_PROFILE_AV1_HIGH) {
+ av_log(avctx, AV_LOG_WARNING, "Forcing High profile\n");
+ param->profile = FF_PROFILE_AV1_HIGH;
+ }
+
+ avctx->bit_rate = param->target_bit_rate;
+
-
return 0;
}
@@ -472,21 +525,22 @@ static const AVOption options[] = {
@@ -350,6 +443,16 @@ static int eb_send_frame(AVCodecContext *avctx, const
headerPtr->p_app_private = NULL;
headerPtr->pts = frame->pts;
+ switch (frame->pict_type) {
+ case AV_PICTURE_TYPE_I:
+ headerPtr->pic_type = EB_AV1_KEY_PICTURE;
+ break;
+ default:
+ // Actually means auto, or default.
+ headerPtr->pic_type = EB_AV1_INVALID_PICTURE;
+ break;
+ }
+
svt_av1_enc_send_picture(svt_enc->svt_handle, headerPtr);
return 0;
@@ -472,21 +575,22 @@ static const AVOption options[] = {
#define OFFSET(x) offsetof(SvtContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
@ -295,7 +349,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
FF_AV1_PROFILE_OPTS
@@ -518,21 +572,20 @@ static const AVOption options[] = {
@@ -518,21 +622,20 @@ static const AVOption options[] = {
{ LEVEL("7.3", 73) },
#undef LEVEL
@ -328,7 +382,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
{NULL},
};
@@ -544,9 +597,10 @@ static const AVCodecDefault eb_enc_defaults[] = {
@@ -544,9 +647,10 @@ static const AVCodecDefault eb_enc_defaults[] = {
};
static const AVCodecDefault eb_enc_defaults[] = {
@ -341,7 +395,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3c4442b249a
{ "qmax", "63" },
{ NULL },
};
@@ -561,12 +615,11 @@ AVCodec ff_libsvtav1_encoder = {
@@ -561,12 +665,11 @@ AVCodec ff_libsvtav1_encoder = {
.receive_packet = eb_receive_packet,
.close = eb_enc_close,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,

View File

@ -1,6 +1,6 @@
PORTNAME= svt-av1
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.0
DISTVERSION= 1.1.0
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
@ -20,7 +20,7 @@ USE_GITLAB= yes
USE_LDCONFIG= yes
GL_ACCOUNT= AOMediaCodec
GL_PROJECT= SVT-AV1
GL_COMMIT= da60d7c6e27c08806da0b493d5d3fc0a08629102
GL_COMMIT= 6e87a1de98281840abebc030781780edd822bae5
CMAKE_ON= ENABLE_NASM
CMAKE_OFF= NATIVE

Some files were not shown because too many files have changed in this diff Show More