ziggi/bsdports
1
0
Fork 0
mirror of https://github.com/beard7n/bsdports.git synced 2026-04-10 02:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

update dosbox, protobuf

Browse Source
This commit is contained in:
Oleg Borodin
2023-05-26 14:13:03 +02:00
parent 701f361672
commit 3c7d13c08b
24 changed files with 84 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/Uses/go.mk
View File

@@ -135,7 +135,7 @@ GO_MODCACHE= file://${GO_GOPATH}/pkg/mod/cache/download
GO_WRKSRC= ${WRKSRC}
GO_ENV+= GOPATH="${GO_GOPATH}" \
GOBIN="${GO_WRKDIR_BIN}" \
GO111MODULE=on \
GO111MODULE=auto \
GOFLAGS=-modcacherw \
GOSUMDB=${GO_GOSUMDB}
. if defined(GO_MODULE)
@@ -163,7 +163,7 @@ GO_GOPATH= ${WRKDIR}
GO_WRKSRC= ${WRKDIR}/src/${GO_PKGNAME}
GO_ENV+= GOPATH="${GO_GOPATH}" \
GOBIN="" \
GO111MODULE=off
GO111MODULE=auto
. endif
BUILD_DEPENDS+= ${GO_CMD}:${GO_PORT}
@@ -220,7 +220,7 @@ do-build:
pkg=$$(${ECHO_CMD} $${t} | \
${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
${ECHO_MSG} "===> Building $${out} from $${pkg}"; \
${SETENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
${SETENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=${GO_GOPROXY} ${GO_CMD} build ${GO_BUILDFLAGS} \
-o ${GO_WRKDIR_BIN}/$${out} \
$${pkg}; \
done)

0
devel/protobuf-go-grpc/Makefile → _unused/protobuf-go-grpc/Makefile
View File

0
devel/protobuf-go-grpc/distinfo → _unused/protobuf-go-grpc/distinfo
View File

0
devel/protobuf-go-grpc/pkg-descr → _unused/protobuf-go-grpc/pkg-descr
View File

0
devel/protobuf-go-grpc/pkg-plist → _unused/protobuf-go-grpc/pkg-plist
View File

4
crypto/libgpg-error/files/patch-x-configure
View File

@@ -6,8 +6,8 @@
# Note that added error codes don't constitute an interface change.
-LIBGPG_ERROR_LT_CURRENT=34
-LIBGPG_ERROR_LT_AGE=34
+LIBGPG_ERROR_LT_CURRENT=11
+LIBGPG_ERROR_LT_AGE=11
+LIBGPG_ERROR_LT_CURRENT=13
+LIBGPG_ERROR_LT_AGE=13
LIBGPG_ERROR_LT_REVISION=0
################################################

2
crypto/libgpg-error/pkg-plist
View File

@@ -7,7 +7,7 @@ include/gpgrt.h
lib/libgpg-error.a
lib/libgpg-error.la
lib/libgpg-error.so
lib/libgpg-error.so.11
lib/libgpg-error.so.13
lib/pkgconfig/gpg-error.pc
man/man1/gpg-error-config.1.gz
man/man1/gpgrt-config.1.gz

16
devel/protobuf-go/Makefile
View File

@@ -2,9 +2,9 @@
# $FreeBSD: head/devel/goprotobuf/Makefile 517745 2019-11-16 12:52:39Z dmgk $
PORTNAME= protobuf-go
DISTNAME= goprotobuf
DISTNAME= protobuf-go
DISTVERSIONPREFIX= v
DISTVERSION= 1.1.0
DISTVERSION= 1.30.0
CATEGORIES= devel
MAINTAINER= cs@FreeBSD.org
@@ -15,12 +15,14 @@ RUN_DEPENDS= protoc:devel/protobuf
USES= go
USE_GITHUB= yes
GH_ACCOUNT= golang
GH_PROJECT= protobuf
GH_SUBDIR= src/github.com/golang/protobuf
GH_TUPLE= google:go-genproto:02b4e95:genproto/src/google.golang.org/genproto
GH_ACCOUNT= protocolbuffers
GH_PROJECT= protobuf-go
GH_SUBDIR= github.com/protocolbuffers/protobuf-go
GH_TUPLE= golang:protobuf:v1.5.0:golang_protobuf/vendor/github.com/golang/protobuf \
golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp
GO_TARGET= ./protoc-gen-go
GO_TARGET= ./cmd/protoc-gen-go
MAKE_ENV+= GO111MODULE=auto

14
devel/protobuf-go/distinfo
View File

@@ -1,5 +1,9 @@
TIMESTAMP = 1532443980
SHA256 (golang-protobuf-v1.1.0_GH0.tar.gz) = c086490e7b116b73b7e3e6058eae997576d0523ad8f1b2ec2b698887e62b14a8
SIZE (golang-protobuf-v1.1.0_GH0.tar.gz) = 324733
SHA256 (google-go-genproto-02b4e95_GH0.tar.gz) = 71421ee0c9af39492dad0c63736e0e3771ecd41066034f77472bd922208fcdfd
SIZE (google-go-genproto-02b4e95_GH0.tar.gz) = 2091400
TIMESTAMP = 1685103025
SHA256 (protocolbuffers-protobuf-go-v1.30.0_GH0.tar.gz) = 3279a16ec3bdd7c53fe1599134de298ed90d9f3b6ec1c1eb5f3b76ba5aaa9f0c
SIZE (protocolbuffers-protobuf-go-v1.30.0_GH0.tar.gz) = 1298988
SHA256 (golang-protobuf-v1.5.0_GH0.tar.gz) = 10bbe0880bb400a63944409f685c55a3f65adf4360caab0cae068c699a9c07fa
SIZE (golang-protobuf-v1.5.0_GH0.tar.gz) = 171512
SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb4d99e6cba2e3e5331d064f46640cc01a0e630ee6a684ae810bd94a7e4eb7
SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e
SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358

4
devel/protobuf/Makefile
View File

@@ -2,9 +2,9 @@
# $FreeBSD: head/devel/protobuf/Makefile 497411 2019-03-31 13:41:02Z sunpoet $
PORTNAME= protobuf
PORTVERSION= 3.14.0
PORTVERSION= 3.21.12
CATEGORIES= devel
MASTER_SITES=<->https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/
MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION:R:E}.${PORTVERSION:E}/
DISTVERSIONPREFIX= cpp-

6
devel/protobuf/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1622635095
SHA256 (protobuf-cpp-3.14.0.tar.gz) = 50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659
SIZE (protobuf-cpp-3.14.0.tar.gz) = 4655133
TIMESTAMP = 1685100153
SHA256 (protobuf-cpp-3.21.12.tar.gz) = 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460
SIZE (protobuf-cpp-3.21.12.tar.gz) = 4842303

11
devel/protobuf/files/patch-configure
View File

@@ -1,11 +0,0 @@
--- configure.orig 2019-07-12 16:18:37 UTC
+++ configure
@@ -20165,7 +20165,7 @@ if test "x$ax_pthread_clang" = "xyes"; t
# ignore this macro, third-party headers might not.)
PTHREAD_CFLAGS="-pthread"
- PTHREAD_LIBS=
+ PTHREAD_LIBS="-pthread"
ax_pthread_ok=yes

13
devel/protobuf/files/patch-i386 Normal file
View File

@@ -0,0 +1,13 @@
Obtained from: https://cgit.freebsd.org/ports/commit/?id=c212fb9fcceacf49ac4f236c7944aaec5d3cfa57
--- src/google/protobuf/arena_impl.h.orig 2022-09-29 19:05:00 UTC
+++ src/google/protobuf/arena_impl.h
@@ -640,7 +640,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
#ifdef _MSC_VER
#pragma warning(disable : 4324)
#endif
- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
+ struct alignas(alignof(std::atomic<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator {
std::atomic<LifecycleIdAtomic> id;
};
static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;

33
devel/protobuf/pkg-plist
View File

@@ -7,16 +7,23 @@ include/google/protobuf/api.proto
include/google/protobuf/arena_impl.h
include/google/protobuf/arena.h
include/google/protobuf/arenastring.h
include/google/protobuf/arenaz_sampler.h
include/google/protobuf/compiler/code_generator.h
include/google/protobuf/compiler/command_line_interface.h
include/google/protobuf/compiler/cpp/cpp_generator.h
include/google/protobuf/compiler/cpp/file.h
include/google/protobuf/compiler/cpp/generator.h
include/google/protobuf/compiler/cpp/helpers.h
include/google/protobuf/compiler/cpp/names.h
include/google/protobuf/compiler/csharp/csharp_doc_comment.h
include/google/protobuf/compiler/csharp/csharp_generator.h
include/google/protobuf/compiler/csharp/csharp_names.h
include/google/protobuf/compiler/csharp/csharp_options.h
include/google/protobuf/compiler/importer.h
include/google/protobuf/compiler/java/generator.h
include/google/protobuf/compiler/java/java_generator.h
include/google/protobuf/compiler/java/java_names.h
include/google/protobuf/compiler/js/js_generator.h
include/google/protobuf/compiler/js/well_known_types_embed.h
include/google/protobuf/compiler/java/kotlin_generator.h
include/google/protobuf/compiler/java/names.h
include/google/protobuf/compiler/objectivec/objectivec_generator.h
include/google/protobuf/compiler/objectivec/objectivec_helpers.h
include/google/protobuf/compiler/parser.h
@@ -24,6 +31,8 @@ include/google/protobuf/compiler/php/php_generator.h
include/google/protobuf/compiler/plugin.h
include/google/protobuf/compiler/plugin.pb.h
include/google/protobuf/compiler/plugin.proto
include/google/protobuf/compiler/python/generator.h
include/google/protobuf/compiler/python/pyi_generator.h
include/google/protobuf/compiler/python/python_generator.h
include/google/protobuf/compiler/ruby/ruby_generator.h
include/google/protobuf/descriptor_database.h
@@ -35,17 +44,23 @@ include/google/protobuf/duration.proto
include/google/protobuf/dynamic_message.h
include/google/protobuf/empty.pb.h
include/google/protobuf/empty.proto
include/google/protobuf/endian.h
include/google/protobuf/explicitly_constructed.h
include/google/protobuf/extension_set_inl.h
include/google/protobuf/extension_set.h
include/google/protobuf/field_access_listener.h
include/google/protobuf/field_mask.pb.h
include/google/protobuf/field_mask.proto
include/google/protobuf/generated_enum_reflection.h
include/google/protobuf/generated_enum_util.h
include/google/protobuf/generated_message_bases.h
include/google/protobuf/generated_message_reflection.h
include/google/protobuf/generated_message_table_driven.h
include/google/protobuf/generated_message_tctable_decl.h
include/google/protobuf/generated_message_tctable_impl.h
include/google/protobuf/generated_message_util.h
include/google/protobuf/has_bits.h
include/google/protobuf/implicit_weak_message.h
include/google/protobuf/inlined_string_field.h
include/google/protobuf/io/coded_stream.h
include/google/protobuf/io/gzip_stream.h
include/google/protobuf/io/io_win32.h
@@ -70,9 +85,11 @@ include/google/protobuf/parse_context.h
include/google/protobuf/port_def.inc
include/google/protobuf/port_undef.inc
include/google/protobuf/port.h
include/google/protobuf/reflection_internal.h
include/google/protobuf/reflection_ops.h
include/google/protobuf/reflection.h
include/google/protobuf/repeated_field.h
include/google/protobuf/repeated_ptr_field.h
include/google/protobuf/service.h
include/google/protobuf/source_context.pb.h
include/google/protobuf/source_context.proto
@@ -115,19 +132,18 @@ include/google/protobuf/wrappers.pb.h
include/google/protobuf/wrappers.proto
lib/libprotobuf-lite.a
lib/libprotobuf-lite.so
lib/libprotobuf-lite.so.25
lib/libprotobuf-lite.so.32
lib/libprotobuf.a
lib/libprotobuf.so
lib/libprotobuf.so.25
lib/libprotobuf.so.32
lib/libprotoc.a
lib/libprotoc.so
lib/libprotoc.so.25
lib/libprotoc.so.32
lib/pkgconfig/protobuf-lite.pc
lib/pkgconfig/protobuf.pc
@dir include/google/protobuf/compiler/cpp
@dir include/google/protobuf/compiler/csharp
@dir include/google/protobuf/compiler/java
@dir include/google/protobuf/compiler/js
@dir include/google/protobuf/compiler/objectivec
@dir include/google/protobuf/compiler/php
@dir include/google/protobuf/compiler/python
@@ -138,3 +154,4 @@ lib/pkgconfig/protobuf.pc
@dir include/google/protobuf/util
@dir include/google/protobuf
@dir include/google
@dir lib/pkgconfig

5
emu/dosbox/Makefile
View File

@@ -2,9 +2,10 @@
# $Id$
#
PORTNAME= dosbox
PORTVERSION= 0.74
DISTVERSION= 0.74-3
CATEGORIES= emulators
MASTER_SITES= SF
#MASTER_SITES= SF
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
MAINTAINER= knyght@gmail.com
COMMENT= Emulator of a PC with DOS

5
emu/dosbox/distinfo
View File

@@ -1,2 +1,3 @@
SHA256 (dosbox-0.74.tar.gz) = 13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05
SIZE (dosbox-0.74.tar.gz) = 1265711
TIMESTAMP = 1684180716
SHA256 (dosbox-0.74-3.tar.gz) = c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a
SIZE (dosbox-0.74-3.tar.gz) = 1326339

11
emu/dosbox/files/patch-include-dos_inc.h
View File

@@ -1,11 +0,0 @@
--- include/dos_inc.h.orig 2010-05-10 13:43:54.000000000 -0400
+++ include/dos_inc.h 2011-10-18 12:05:51.186449095 -0400
@@ -28,6 +28,8 @@
#include "mem.h"
#endif
+#include <stddef.h>
+
#ifdef _MSC_VER
#pragma pack (1)
#endif

0
emu/dosbox/files/patch-include-setup.h → emu/dosbox/files/patch-include_setup.h
View File

14
emu/dosbox/files/patch-src-cpu_core_dynrec_risc_x64.h
View File

@@ -1,14 +0,0 @@
Index: src/cpu/core_dynrec/risc_x64.h
===================================================================
--- src/cpu/core_dynrec/risc_x64.h (revision 3775)
+++ src/cpu/core_dynrec/risc_x64.h (working copy)
@@ -85,7 +85,8 @@
static INLINE void gen_reg_memaddr(HostReg reg,void* data) {
Bit64s diff = (Bit64s)data-((Bit64s)cache.pos+5);
- if ((diff<0x80000000LL) && (diff>-0x80000000LL)) {
+ if ((Bit64u)diff<0x0000000080000000ULL ||
+ (Bit64u)diff>0xffffffff80000000ULL) {
cache_addb(0x05+(reg<<3));
// RIP-relative addressing is offset after the instruction
cache_addd((Bit32u)(((Bit64u)diff)&0xffffffffLL));

24
emu/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
View File

@@ -1,24 +0,0 @@
Index: src/fpu/fpu_instructions_x86.h
@@ -1162,12 +1162,12 @@
static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
- FPUD_LOAD(fild,WORD,)
+ FPUD_LOAD(fild,WORD,s)
}
static void FPU_FLD_I16_EA(PhysPt addr) {
fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
- FPUD_LOAD_EA(fild,WORD,)
+ FPUD_LOAD_EA(fild,WORD,s)
}
static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
@@ -1212,7 +1212,7 @@
}
static void FPU_FST_I16(PhysPt addr) {
- FPUD_STORE(fistp,WORD,)
+ FPUD_STORE(fistp,WORD,s)
mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
}

11
emu/dosbox/files/patch-src_gui_sdlmain.cpp Normal file
View File

@@ -0,0 +1,11 @@
--- src/gui/sdlmain.cpp.orig 2020-03-21 19:17:13 UTC
+++ src/gui/sdlmain.cpp
@@ -1433,7 +1433,7 @@ void GFX_LosingFocus(void) {
#define DB_POLLSKIP 1
#endif
-#if defined(LINUX)
+#if defined(LINUX) || defined(BSD)
#define SDL_XORG_FIX 1
#else
#define SDL_XORG_FIX 0

11
emu/dosbox/files/patch-src_ints_int10_vesa.cpp
View File

@@ -1,11 +0,0 @@
--- src/ints/int10_vesa.cpp.orig 2018-01-28 08:20:24.891924000 -0800
+++ src/ints/int10_vesa.cpp 2018-01-28 08:20:38.015119000 -0800
@@ -39,7 +39,7 @@ static struct {
static char string_oem[]="S3 Incorporated. Trio64";
static char string_vendorname[]="DOSBox Development Team";
static char string_productname[]="DOSBox - The DOS Emulator";
-static char string_productrev[]="DOSBox "VERSION;
+static char string_productrev[]="DOSBox " VERSION;
#ifdef _MSC_VER
#pragma pack (1)

25
emu/dosbox/files/patch-x-src-gui-sdlmain.cpp
View File

@@ -1,25 +0,0 @@
--- ./src/gui/sdlmain.cpp.orig 2010-05-10 20:43:54.000000000 +0300
+++ ./src/gui/sdlmain.cpp 2018-07-31 12:42:20.835651000 +0200
@@ -51,7 +51,7 @@
#include "cross.h"
#include "control.h"
-#define MAPPERFILE "mapper-" VERSION ".map"
+#define MAPPERFILE "mapper.map"
//#define DISABLE_JOYSTICK
#if C_OPENGL
@@ -1134,10 +1134,10 @@
#endif
const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
if(gl_ext && *gl_ext){
- sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0);
- sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0);
+ sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") != 0);
+ sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") != 0);
#if defined(NVIDIA_PixelDataRange)
- sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) &&
+ sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") != 0 ) &&
glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
sdl.opengl.pixel_data_range = 0;
#endif

11
emu/dosbox/files/patch-x-src-misc-cross.cpp
View File

@@ -1,11 +0,0 @@
--- ./src/misc/cross.cpp.orig 2010-05-10 20:43:54.000000000 +0300
+++ ./src/misc/cross.cpp 2018-07-31 12:44:10.842197000 +0200
@@ -75,7 +75,7 @@
#elif defined(MACOSX)
#define DEFAULT_CONFIG_FILE "DOSBox " VERSION " Preferences"
#else /*linux freebsd*/
-#define DEFAULT_CONFIG_FILE "dosbox-" VERSION ".conf"
+#define DEFAULT_CONFIG_FILE "dosbox.conf"
#endif
in = DEFAULT_CONFIG_FILE;
}