opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

*/*: sync with upstream 

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-05-04 06:48:28 +02:00
parent 752fc7092f
commit 1e867dfbe7
211 changed files with 3032 additions and 1376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archivers/libcabinet/Makefile
View File

@ -10,11 +10,8 @@ MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable library and utility to use Microsoft cabinet files (.cab)
USE_LDCONFIG= yes
BROKEN_aarch64= Fails to link: linker command failed with exit code 1
USES= uidfix
USE_LDCONFIG= yes
SRCFILE= ${WRKSRC}/listcab.cpp
PROGFILE= ${SRCFILE:S/.cpp$//}
MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null

1
audio/guitarix-lv2/Makefile
View File

@ -14,7 +14,6 @@ COMMENT= Virtual versatile amplification for Jack and set of LV2 plugins
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_aarch64= fails to compile: unknown FP unit 'sse'
BROKEN_armv6= fails to compile: unknown FP unit 'sse'
BROKEN_armv7= fails to compile: unknown FP unit 'sse'
BROKEN_powerpc64= fails to compile: unknown FP unit 'sse'

4
audio/lollypop/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1553544004
SHA256 (World-lollypop-8e6fbe2294bbdfe3c3ee5889c2093d9274618e04_GL0.tar.gz) = 601c71d30cb9d60a076e054808a8801c7232f0886c4e5766dad2c401c34ff99e
SIZE (World-lollypop-8e6fbe2294bbdfe3c3ee5889c2093d9274618e04_GL0.tar.gz) = 371105
SHA256 (World-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 99ebb8eb206934c41c014889ef4b0102049b2fe791640204958c83b1624ad416
SIZE (World-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 467580
SHA256 (gnumdk-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 99ebb8eb206934c41c014889ef4b0102049b2fe791640204958c83b1624ad416
SIZE (gnumdk-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 467580

1
audio/yoshimi/Makefile
View File

@ -11,7 +11,6 @@ COMMENT= Sophisticated software synthesizer
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_aarch64= fails to compile: c++: warning: argument unused during compilation: '-msse'
BROKEN_armv6= fails to compile: c++: warning: argument unused during compilation: '-msse'
BROKEN_armv7= fails to compile: c++: warning: argument unused during compilation: '-msse'

1
biology/Makefile
View File

@ -33,6 +33,7 @@
SUBDIR += fastahack
SUBDIR += fastdnaml
SUBDIR += fastool
SUBDIR += fastp
SUBDIR += fastqc
SUBDIR += fasttree
SUBDIR += fastx-toolkit

32
biology/fastp/Makefile Normal file
View File

@ -0,0 +1,32 @@
# $FreeBSD$
PORTNAME= fastp
DISTVERSIONPREFIX= v
DISTVERSION= 0.20.0
CATEGORIES= biology
MAINTAINER= jwb@FreeBSD.org
COMMENT= Ultra-fast all-in-one FASTQ preprocessor
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= compiler:c++11-lang gmake
USE_GITHUB= yes
GH_ACCOUNT= OpenGene
ALL_TARGET= fastp
PLIST_FILES= bin/fastp
.include <bsd.port.pre.mk>
# Force newer compiler on platforms using GCC 4.2 as base
.if ${CHOSEN_COMPILER_TYPE} == gcc
USE_GCC= yes
.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fastp
.include <bsd.port.post.mk>

3
biology/fastp/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1556889058
SHA256 (OpenGene-fastp-v0.20.0_GH0.tar.gz) = 8d751d2746db11ff233032fc49e3bcc8b53758dd4596fdcf4b4099a4d702ac22
SIZE (OpenGene-fastp-v0.20.0_GH0.tar.gz) = 139422

34
biology/fastp/files/patch-Makefile Normal file
View File

@ -0,0 +1,34 @@
--- Makefile.orig 2019-04-17 03:23:22 UTC
+++ Makefile
@@ -3,9 +3,11 @@ DIR_SRC := ./src
DIR_OBJ := ./obj
PREFIX ?= /usr/local
+DESTDIR ?=
BINDIR ?= $(PREFIX)/bin
INCLUDE_DIRS ?=
LIBRARY_DIRS ?=
+STRIP_CMD ?= strip
SRC := $(wildcard ${DIR_SRC}/*.cpp)
OBJ := $(patsubst %.cpp,${DIR_OBJ}/%.o,$(notdir ${SRC}))
@@ -15,7 +17,8 @@ TARGET := fastp
BIN_TARGET := ${TARGET}
CXX ?= g++
-CXXFLAGS := -std=c++11 -g -O3 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) ${CXXFLAGS}
+CXXFLAGS ?= -g -O3
+CXXFLAGS += -std=c++11 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
LIBS := -lz -lpthread
LD_FLAGS := $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS) $(LD_FLAGS)
@@ -38,5 +41,8 @@ make_obj_dir:
fi
install:
- install $(TARGET) $(BINDIR)/$(TARGET)
+ install $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
@echo "Installed."
+
+install-strip: install
+ $(STRIP_CMD) $(DESTDIR)$(BINDIR)/$(TARGET)

5
biology/fastp/pkg-descr Normal file
View File

@ -0,0 +1,5 @@
fastp is a tool designed to provide fast all-in-one preprocessing for FastQ
files. This tool is developed in C++ with multithreading supported to afford
high performance.
WWW: https://github.com/OpenGene/fastp

4
biology/jellyfish/Makefile
View File

@ -2,8 +2,8 @@
PORTNAME= jellyfish
PORTVERSION= 2.2.6
PORTREVISION= 4
DISTVERSIONPREFIX= v
PORTREVISION= 4
CATEGORIES= biology
MAINTAINER= jwb@FreeBSD.org
@ -27,8 +27,6 @@ INSTALL_TARGET= install-strip
PLIST_SUB= VER=${PORTVERSION}
BROKEN_aarch64= Fails to compile: error: variable res is uninitialized
.include <bsd.port.pre.mk>
# SSE code assumes amd64 features

2
cad/sp2sp/Makefile
View File

@ -14,8 +14,6 @@ LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
BROKEN_aarch64= Fails to configure: PKG_PROG_PKG_CONFIG: not found
USES= autoreconf gettext-runtime pkgconfig
USE_GNOME= gtk20 pango atk cairo gdkpixbuf2 glib20
GNU_CONFIGURE= yes

4
comms/cubicsdr/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1551114984
SHA256 (cubicsdr-0.2.5_GH0.tar.gz) = 5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
SIZE (cubicsdr-0.2.5_GH0.tar.gz) = 36911106
SHA256 (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
SIZE (cjcliffe-CubicSDR-0.2.5_GH0.tar.gz) = 36911106

3
databases/pg_citus/Makefile
View File

@ -3,8 +3,8 @@
PORTNAME= citus
PORTVERSION= 8.2.1
PORTREVISION= 1
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= databases
PKGNAMEPREFIX= pg_
@ -13,7 +13,6 @@ COMMENT= Horizontally scale Postgresql using sharding and replication
LICENSE= AGPLv3
BROKEN_aarch64= fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?
BROKEN_armv6= fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?
BROKEN_armv7= fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?
BROKEN_i386= fails to compile: transaction/backend_data.c:727:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?

6
databases/py-mysqlclient/Makefile
View File

@ -1,9 +1,10 @@
# $FreeBSD$
PORTNAME= mysqlclient
DISTVERSION= 1.3.13
DISTVERSION= 1.4.2.post1
CATEGORIES= databases python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTVERSIONPREFIX= v
MAINTAINER= neel@neelc.org
COMMENT= MySQL database connector for Python
@ -24,9 +25,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= DOCS
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mysql.so
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}

6
databases/py-mysqlclient/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1532783265
SHA256 (pymysql-mysqlclient-python-1.3.13_GH0.tar.gz) = 9600c2540d914bb4e9c09ecd77e7836cc41537db8c3b3777901ffc2cb7975578
SIZE (pymysql-mysqlclient-python-1.3.13_GH0.tar.gz) = 92948
TIMESTAMP = 1556803957
SHA256 (pymysql-mysqlclient-python-v1.4.2.post1_GH0.tar.gz) = ab305c5ff58cf5a7de51561ac779a76d240cca329abda45bcd043c801876530d
SIZE (pymysql-mysqlclient-python-v1.4.2.post1_GH0.tar.gz) = 87983

40
databases/redisdesktopmanager/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= redisdesktopmanager
PORTVERSION= 0.9.9
PORTREVISION= 1
PORTVERSION= 2019.0
CATEGORIES= databases
MAINTAINER= swills@FreeBSD.org
@ -14,25 +13,30 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libssh2.so:security/libssh2
USES= compiler:c++0x dos2unix gl kde:5 qmake qt:5 ssl
DOS2UNIX_FILES= 3rdparty/3rdparty.pri
USE_GL= gl
USE_GITHUB= yes
BUILD_WRKSRC= ${WRKSRC}/src
DOS2UNIX_FILES= 3rdparty/3rdparty.pri
BUILD_WRKSRC= ${WRKSRC}/src
CONFIGURE_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${WRKSRC}/bin/freebsd/release
PLIST_FILES= bin/rdm \
share/pixmaps/rdm.png
DESKTOP_ENTRIES= "Redis Desktop Manager" "Redis Desktop Manager" "rdm.png" "rdm" "Development;" ""
GH_TUPLE= \
uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \
benlau:asyncfuture:4579d53:asyncfuture/3rdparty/asyncfuture \
RedisDesktop:CrashReporter:0202f9b:crashreporter/3rdparty/crashreporter \
uglide:qredisclient:e645999:qredisclient/3rdparty/qredisclient \
sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
libssh2:libssh2:62b825c:libssh2/3rdparty/qredisclient/3rdparty/qsshclient/3rdparty/libssh2
USE_QT= buildtools_build charts concurrent core declarative gui network qmake_build widgets
INSTALL_WRKSRC= ${WRKSRC}/bin/freebsd/release
PLIST_FILES= bin/rdm \
share/pixmaps/rdm.png
DESKTOP_ENTRIES= "Redis Desktop Manager" \
"Redis Desktop Manager" \
"rdm.png" \
"rdm" \
"Development;" \
""
GH_TUPLE= uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \
benlau:asyncfuture:4579d53:asyncfuture/3rdparty/asyncfuture \
RedisDesktop:CrashReporter:0202f9b:crashreporter/3rdparty/crashreporter \
uglide:qredisclient:0a0cc36:qredisclient/3rdparty/qredisclient \
sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
redis:hiredis:6850306:hiredis/3rdparty/qredisclient/3rdparty/hiredis
USE_QT= charts concurrent core declarative gui network widgets \
buildtools_build qmake_build
post-patch:
@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h

16
databases/redisdesktopmanager/distinfo
View File

@ -1,17 +1,15 @@
TIMESTAMP = 1543593147
SHA256 (uglide-RedisDesktopManager-0.9.9_GH0.tar.gz) = 8f7244813d5a82bc686a3af9f98e1372479c9861d724ba7e7a2b162ccf35d9bb
SIZE (uglide-RedisDesktopManager-0.9.9_GH0.tar.gz) = 1980287
TIMESTAMP = 1556928655
SHA256 (uglide-RedisDesktopManager-2019.0_GH0.tar.gz) = ad943e146198769bcdaec8c1d41366e9bb4f6d4e76659a04b17dbf1f3646a731
SIZE (uglide-RedisDesktopManager-2019.0_GH0.tar.gz) = 2323883
SHA256 (benlau-asyncfuture-4579d53_GH0.tar.gz) = ce5a3a4bc61f22f182eb8f932a3736289fc541e7487244fd57c93a141a038fe4
SIZE (benlau-asyncfuture-4579d53_GH0.tar.gz) = 31928
SHA256 (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 4b0745dd12449716279a618eab0c8706422a0f67af680d0bf71471f9dbd371cb
SIZE (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 14232
SHA256 (uglide-qredisclient-e645999_GH0.tar.gz) = ceda742955aa46d7cd32334c610b608f5274fa022eb5d2044a36577caadaa640
SIZE (uglide-qredisclient-e645999_GH0.tar.gz) = 214348
SHA256 (uglide-qredisclient-0a0cc36_GH0.tar.gz) = cd14ba22669d7689546675a7fe899eacfc6234ce2c66e23ffd6dafd851f5db33
SIZE (uglide-qredisclient-0a0cc36_GH0.tar.gz) = 216222
SHA256 (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 8bbc578430ab2fd6665ff2f2f6fcf402b3346b6d3cdfcc16e8c1d8f5a8f75ea2
SIZE (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 3792
SHA256 (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = b9eaed71f8cae6d4fa1e6cf7de979ba8a5d1a14e2681cf1a0f2bfc42d5960ea1
SIZE (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = 10446
SHA256 (redis-hiredis-53c3243_GH0.tar.gz) = 38e38efff19715d5e2f49c77b9db35f7cd005d66ae3d0944630424c64cf3950d
SIZE (redis-hiredis-53c3243_GH0.tar.gz) = 58204
SHA256 (libssh2-libssh2-62b825c_GH0.tar.gz) = 9a2ee1e1e6980df6f0fbfafa5a038726c24d60688d9e8048040a997e163a2aad
SIZE (libssh2-libssh2-62b825c_GH0.tar.gz) = 428936
SHA256 (redis-hiredis-6850306_GH0.tar.gz) = f30e78ba3f8ae8effaf538c26412302bcd82a0268741de6441d30bc7c43dd90c
SIZE (redis-hiredis-6850306_GH0.tar.gz) = 63061

11
databases/redisdesktopmanager/files/patch-src_modules_server-stats_serverstatsmodel.cpp
View File

@ -1,11 +0,0 @@
--- src/modules/server-stats/serverstatsmodel.cpp.orig 2018-11-30 15:43:21 UTC
+++ src/modules/server-stats/serverstatsmodel.cpp
@@ -21,7 +21,7 @@ ServerStats::Model::Model(QSharedPointer<RedisClient::
return;
}
- m_serverInfo = RedisClient::ServerInfo::fromString(r.toRawString(-1))
+ m_serverInfo = RedisClient::ServerInfo::fromString(r.toRawString())
.parsed.toVariantMap();
emit serverInfoChanged();
});

4
devel/bazel/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bazel
DISTVERSION= 0.24.0
DISTVERSION= 0.25.0
CATEGORIES= devel java
MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist
@ -24,7 +24,7 @@ BUILD_DEPENDS= bash:shells/bash \
# In bazel, a release is always code-wise identical to the final release candidate.
# Hence we can also download that one and so have a simple way to also test earlier release
# candidates.
FINALRC= 9
FINALRC= 8
USES= shebangfix zip:infozip python
SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)

6
devel/bazel/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1553283833
SHA256 (bazel-0.24.0rc9-dist.zip) = 6bbef5fcb37a0bc8ed52b5514ff3f4b4e49b7a5e4f2c02d025e5c9e47cbc8ece
SIZE (bazel-0.24.0rc9-dist.zip) = 174689646
TIMESTAMP = 1556707468
SHA256 (bazel-0.25.0rc8-dist.zip) = 68bd06162f79cdca0c7932725eee0db22a432b73fbab1821391706eaa473f18b
SIZE (bazel-0.25.0rc8-dist.zip) = 275800512

4
devel/git-cinnabar/Makefile
View File

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= git-cinnabar
DISTVERSION= 0.5.0-162
DISTVERSIONSUFFIX= -gd04f9fb
DISTVERSION= 0.5.0-168
DISTVERSIONSUFFIX= -g89b9a17
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org

6
devel/git-cinnabar/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1556701422
SHA256 (glandium-git-cinnabar-0.5.0-162-gd04f9fb_GH0.tar.gz) = 1599413f85bdee4a64cab22fb0aeb7c52633bd372892a58991645a0a1d1dc1e9
SIZE (glandium-git-cinnabar-0.5.0-162-gd04f9fb_GH0.tar.gz) = 158440
TIMESTAMP = 1556774927
SHA256 (glandium-git-cinnabar-0.5.0-168-g89b9a17_GH0.tar.gz) = 497ae88eacf8bcc75561bd0de8371291553c140261c23888861309bde68f20e0
SIZE (glandium-git-cinnabar-0.5.0-168-g89b9a17_GH0.tar.gz) = 159221

1
devel/k8048/Makefile
View File

@ -11,7 +11,6 @@ COMMENT= Programs Microchip PICs using Velleman K8048 board
LICENSE= BSD3CLAUSE
BROKEN_aarch64= invokes x86 assembler
BROKEN_armv6= invokes x86 assembler
BROKEN_armv7= invokes x86 assembler
BROKEN_mips= invokes x86 assembler

3
devel/libzim/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libzim
PORTVERSION= 4.0.4
PORTREVISION= 2
PORTVERSION= 4.0.7
CATEGORIES= devel
MAINTAINER= swills@FreeBSD.org

6
devel/libzim/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1543967332
SHA256 (openzim-libzim-4.0.4_GH0.tar.gz) = 8f56a16d15e810150d3c3ee9acce3606f676c90b72936e11f77f2a2548cd4611
SIZE (openzim-libzim-4.0.4_GH0.tar.gz) = 1653434
TIMESTAMP = 1556887392
SHA256 (openzim-libzim-4.0.7_GH0.tar.gz) = ede654ffe4ec63aaeb9404010d72e3e6afe6b1dbf34bb0c706a67e094eba4438
SIZE (openzim-libzim-4.0.7_GH0.tar.gz) = 1654078

10
devel/libzim/files/patch-meson.build
View File

@ -1,8 +1,8 @@
--- meson.build.orig 2018-09-04 16:23:32 UTC
--- meson.build.orig 2019-04-15 13:10:25 UTC
+++ meson.build
@@ -1,7 +1,7 @@
project('libzim', ['c', 'cpp'],
version : '4.0.4',
version : '4.0.7',
license : 'GPL2',
- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
+ default_options : ['c_std=c11', 'cpp_std=c++11'])
@ -16,10 +16,10 @@
+cc = meson.get_compiler('c')
+execinfo_dep = cc.find_library('execinfo', required : false)
+
zlib_dep = dependency('zlib', required:false)
conf.set('ENABLE_ZLIB', zlib_dep.found())
static_linkage = get_option('static-linkage')
static_linkage = static_linkage or get_option('default_library')=='static'
@@ -70,3 +73,4 @@ pkg_mod.generate(libraries : libzim,
@@ -73,3 +76,4 @@ pkg_mod.generate(libraries : libzim,
filebase : 'libzim',
description : 'A Library to zim.',
requires : pkg_requires)

2
devel/modules2tuple/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= modules2tuple
PORTVERSION= 1.2.0
PORTVERSION= 1.3.0
DISTVERSIONPREFIX= v
CATEGORIES= devel

6
devel/modules2tuple/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1556495241
SHA256 (dmgk-modules2tuple-v1.2.0_GH0.tar.gz) = 0b93664cea45d8f535cb0465a4fda61680de0ca769c8102f597ff25719e8136f
SIZE (dmgk-modules2tuple-v1.2.0_GH0.tar.gz) = 4652
TIMESTAMP = 1556719438
SHA256 (dmgk-modules2tuple-v1.3.0_GH0.tar.gz) = c5dab8b33022ecbea3cb9d91c3a5258bd0688446c642fb634006ea34fee95986
SIZE (dmgk-modules2tuple-v1.3.0_GH0.tar.gz) = 4806

2
devel/ncurses/Makefile
View File

@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_sparc64= cannot build: coredump: illegal instruction
SNAPSHOT= 20190112
SNAPSHOT= 20190427
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT=../configure
CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \

6
devel/ncurses/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547521716
SHA256 (ncurses/ncurses-6.1-20190112.tgz) = a25b7c37c8b50e2a1b02f9df6f65beafcab158e284b71600a9fe8bc868c84983
SIZE (ncurses/ncurses-6.1-20190112.tgz) = 3432152
TIMESTAMP = 1556890998
SHA256 (ncurses/ncurses-6.1-20190427.tgz) = fb4570b7f90dc2c2947e88c7ba1fdc6e970cebc18d109851b3b7de4be35a186a
SIZE (ncurses/ncurses-6.1-20190427.tgz) = 3432879

1
devel/ncurses/pkg-plist
View File

@ -893,6 +893,7 @@ libdata/pkgconfig/tinfow.pc
%%MANPAGES%%man/man3/use_legacy_coding.3x.gz
%%MANPAGES%%man/man3/use_screen.3x.gz
%%MANPAGES%%man/man3/use_tioctl.3x.gz
%%MANPAGES%%man/man3/use_tioctl_sp.3x.gz
%%MANPAGES%%man/man3/use_window.3x.gz
%%MANPAGES%%man/man3/vid_attr_sp.3x.gz
%%MANPAGES%%man/man3/vid_attr.3x.gz

2
devel/p5-UUID/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= UUID
PORTVERSION= 0.27
PORTVERSION= 0.28
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JNH

6
devel/p5-UUID/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1515952274
SHA256 (UUID-0.27.tar.gz) = ff1df2d0b0d790231166bac75b8f0c09596913fd34b765cbf0c163118353d1ef
SIZE (UUID-0.27.tar.gz) = 14690
TIMESTAMP = 1556894068
SHA256 (UUID-0.28.tar.gz) = a5c173fada973df095bd05959a3963bf24afd7fef0fd1884eff589ca8c17bb7e
SIZE (UUID-0.28.tar.gz) = 15828

1
devel/pecl-grpc/Makefile
View File

@ -11,7 +11,6 @@ COMMENT= High performance, general RPC framework
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_aarch64= fails to compile: fatal error: sys/auxv.h file not found
BROKEN_mips= fails to compile: fatal error: sys/auxv.h file not found
BROKEN_mips64= fails to compile: fatal error: sys/auxv.h file not found
BROKEN_powerpc64= fails to compile: cc1: error: unrecognized command line option "-Wno-parentheses-equality"

2
devel/py-buildbot-console-view/Makefile
View File

@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
USES= compiler:c11 python:3.5+
USES= python:3.5+
USE_PYTHON= autoplist distutils
NO_ARCH= yes

4
editors/jucipp/distinfo
View File

@ -3,5 +3,5 @@ SHA256 (cppit-jucipp-ec182761603fa01fe008f09989b99acdf3466096_GL0.tar.gz) = 7a8e
SIZE (cppit-jucipp-ec182761603fa01fe008f09989b99acdf3466096_GL0.tar.gz) = 578203
SHA256 (cppit-libclangmm-2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd_GL0.tar.gz) = 538003cc308185a952fbbba7688d4d4e79a7e6707ad9daf62034347c3036a2b4
SIZE (cppit-libclangmm-2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd_GL0.tar.gz) = 18069
SHA256 (cppit-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = dc8e7c0632773a1366f7824b2ede517c333435a281b851cdcb6abcc22dd136ed
SIZE (cppit-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = 9756
SHA256 (eidheim-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = dc8e7c0632773a1366f7824b2ede517c333435a281b851cdcb6abcc22dd136ed
SIZE (eidheim-tiny-process-library-54b95a21cf35f8467e21038f523fd3342a77de4c_GL0.tar.gz) = 9756

4
emulators/citra/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citra
PORTVERSION= s20190501
PORTVERSION= s20190503
PORTREVISION?= 0
CATEGORIES= emulators
@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs
USE_GITHUB= yes
GH_ACCOUNT= citra-emu
GH_TAGNAME= 623b0621a
GH_TAGNAME= 2c5816978
GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \

6
emulators/citra/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1556713729
SHA256 (citra-emu-citra-s20190501-623b0621a_GH0.tar.gz) = aefcb7f730509aed7879bbf5a20c859208e193e81074a69dfaa78c0059f69b9f
SIZE (citra-emu-citra-s20190501-623b0621a_GH0.tar.gz) = 4933491
TIMESTAMP = 1556896351
SHA256 (citra-emu-citra-s20190503-2c5816978_GH0.tar.gz) = ebc6a2b8d70ca81e62dac540c33f7be1ed2dfe4bb9d36f44fd3c61fb3b8aac47
SIZE (citra-emu-citra-s20190503-2c5816978_GH0.tar.gz) = 5044175
SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c

1
emulators/hatari/Makefile
View File

@ -13,7 +13,6 @@ COMMENT= Atari ST emulator
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/gpl.txt
BROKEN_aarch64= fails to configure: error: unrecognized CPU type
BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed
LIB_DEPENDS= libportaudio.so:audio/portaudio \

4
emulators/rpcs3/Makefile
View File

@ -2,8 +2,8 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.6-8051 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -g6b7cd458e
DISTVERSION= 0.0.6-8056 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -g2b4da1870
CATEGORIES= emulators
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

6
emulators/rpcs3/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1556714181
SHA256 (RPCS3-rpcs3-v0.0.6-8051-g6b7cd458e_GH0.tar.gz) = 74188017a1f026b480aec646969c4b98d30651a77a32f0d51a13e6247ccc30a5
SIZE (RPCS3-rpcs3-v0.0.6-8051-g6b7cd458e_GH0.tar.gz) = 5300309
TIMESTAMP = 1556793583
SHA256 (RPCS3-rpcs3-v0.0.6-8056-g2b4da1870_GH0.tar.gz) = a9a37748306711cf0434891bf98f4b452b40dbbe08050c392f24c9657d53043a
SIZE (RPCS3-rpcs3-v0.0.6-8056-g2b4da1870_GH0.tar.gz) = 5301299
SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e

1
games/7kaa/Makefile
View File

@ -13,7 +13,6 @@ COMMENT= Seven Kingdoms: Ancient Adversaries
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_aarch64= fails to compile: OBULLET.cpp:41:9: constant expression evaluates to -1 which cannot be narrowed to type 'char'
BROKEN_armv6= fails to compile: OBULLET.cpp:41:9: constant expression evaluates to -1 which cannot be narrowed to type 'char'
BROKEN_armv7= fails to compile: OBULLET.cpp:41:9: constant expression evaluates to -1 which cannot be narrowed to type 'char'

2
games/eduke32/Makefile
View File

@ -24,8 +24,6 @@ LICENSE_FILE_BUILDLIC= ${WRKSRC}/source/build/buildlic.txt
LICENSE_FILE_GPLv2= ${WRKSRC}/source/duke3d/gpl-2.0.txt
LICENSE_PERMS_BUILDLIC= dist-mirror pkg-mirror auto-accept
BROKEN_aarch64= fails to compile: polymost.cpp:2403:18: non-constant-expression cannot be narrowed from type 'long' to 'int32_t' (aka 'int') in initializer list
LIB_DEPENDS= libFLAC.so:audio/flac \
libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis \

1
games/exult/Makefile
View File

@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_armv6= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
BROKEN_armv7= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
BROKEN_aarch64= fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char
LIB_DEPENDS= libvorbis.so:audio/libvorbis \
libpng.so:graphics/png

15
games/frozen-bubble/Makefile
View File

@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= frozen-bubble
DISTVERSION= 2.2.1-beta1
PORTREVISION= 7
DISTVERSION= 2.213.g${SNAPDATE}
CATEGORIES= games
MASTER_SITES= http://www.frozen-bubble.org/data/
MAINTAINER= ports@FreeBSD.org
COMMENT= Throw colourful bubbles to build groups and destroy the groups
COMMENT= Shoot frozen bubbles to build groups of the same color
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${RUN_DEPENDS} \
p5-File-Slurp>=0:devel/p5-File-Slurp
@ -22,10 +21,16 @@ RUN_DEPENDS= p5-SDL>=2.511:devel/p5-SDL \
p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
p5-Alien-SDL>=1.413:devel/p5-Alien-SDL
USES= compiler:features perl5 pkgconfig tar:bzip2
USES= compiler:features gettext-runtime perl5 pkgconfig tar:bzip2
USE_GNOME= glib20
USE_PERL5= modbuild
USE_SDL= mixer pango sdl ttf
USE_GITHUB= yes
GH_ACCOUNT= kthakore
GH_TAGNAME= d6a0291
SNAPDATE= 20170702
DESKTOP_ENTRIES= "Frozen Bubble" "" \
"${PREFIX}/share/pixmaps/frozen-bubble.png" \
"${PORTNAME}" "ArcadeGame;Game;" true

5
games/frozen-bubble/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (frozen-bubble-2.2.1-beta1.tar.bz2) = c5be403ccb71543dab1aeb7d5ae311e18693f79937fb9159469cdad0abf18ac4
SIZE (frozen-bubble-2.2.1-beta1.tar.bz2) = 22424798
TIMESTAMP = 1556832014
SHA256 (kthakore-frozen-bubble-2.213.g20170702-d6a0291_GH0.tar.gz) = b0f586c248b431f491afce07f43a2b168088cde560296d355e0118e8ac10f7cb
SIZE (kthakore-frozen-bubble-2.213.g20170702-d6a0291_GH0.tar.gz) = 22299181

3
games/frozen-bubble/pkg-descr
View File

@ -2,4 +2,5 @@ Frozen Bubble is a game in which you throw colorful bubbles and build
groups to destroy the bubbles. In 1p mode, destroy all the bubbles to
access the next level. In 2p mode, have your opponent die before you.
WWW: http://www.frozen-bubble.org/
WWW: http://www.frozen-bubble.org
WWW: https://github.com/kthakore/frozen-bubble

3
games/frozen-bubble/pkg-plist
View File

@ -3185,6 +3185,7 @@ bin/frozen-bubble-editor
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0066.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0067.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/win_rp4_0068.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/window_icon_penguin.bmp
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/pinguins/window_icon_penguin.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/purple_hover.gif
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/gfx/scroll_list_background.png
@ -3211,6 +3212,7 @@ bin/frozen-bubble-editor
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-32x32.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-48x48.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble-icon-64x64.png
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/icons/frozen-bubble.ico
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/af.po
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/bg.po
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/br.po
@ -3243,6 +3245,7 @@ bin/frozen-bubble-editor
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/sv.po
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/tr.po
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/zh_CN.po
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/locale/zh_TW.po
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/applause.ogg
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/cancel.ogg
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/chatted.ogg

2
games/gtkradiant/Makefile
View File

@ -16,8 +16,6 @@ COMMENT= Map editor for FPS games, by id Software and Loki Software
LICENSE= GPLv2
BROKEN_aarch64= Fails to link: error: ldd command returned with exit code 256
LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
libmhash.so:security/mhash \
libpng.so:graphics/png

2
games/linux-unigine-valley/pkg-descr
View File

@ -10,4 +10,4 @@ fully interactive modes available to the end user.
This port includes the linux-binaries of the basic (free-to-use)
version of the benchmark.
WWW: http://unigine.com/en/products/benchmarks/valley
WWW: https://benchmark.unigine.com/valley

4
games/openbor/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= openbor
# Hint: svn revision is git rev-list --count ${GH_TAGNAME}
PORTVERSION?= 6989
PORTVERSION?= 7000
.ifndef PKGNAMESUFFIX
PORTREVISION= 0
.endif
@ -31,7 +31,7 @@ PORTSCOUT= ignore:1
USE_GITHUB= yes
GH_ACCOUNT= DCurrent
GH_TAGNAME?= 66657298
GH_TAGNAME?= dc6a1516
USES+= gmake pkgconfig
.if ${PORTVERSION} < 4433

6
games/openbor/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1555972430
SHA256 (DCurrent-openbor-6989-66657298_GH0.tar.gz) = 1cb7d1dff760d2b1ddb8440dc0f4ef07794e840343240f0c4b5d8279908b8f34
SIZE (DCurrent-openbor-6989-66657298_GH0.tar.gz) = 129045347
TIMESTAMP = 1556884312
SHA256 (DCurrent-openbor-7000-dc6a1516_GH0.tar.gz) = 9d7307a7af5805f639924b7439ae1128747c2fd92c85a97e75e3b86f938aead7
SIZE (DCurrent-openbor-7000-dc6a1516_GH0.tar.gz) = 129096125

33
games/openrct2/Makefile
View File

@ -3,8 +3,7 @@
PORTNAME= openrct2
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.2
PORTREVISION= 2
DISTVERSION= 0.2.2
CATEGORIES= games
MAINTAINER= pkubaj@anongoth.pl
@ -19,30 +18,42 @@ LIB_DEPENDS= libpng.so:graphics/png \
libspeexdsp.so:audio/speexdsp \
libfontconfig.so:x11-fonts/fontconfig \
libcurl.so:ftp/curl \
libfreetype.so:print/freetype2
libfreetype.so:print/freetype2 \
libicuuc.so:devel/icu
USE_HARDENING= pie:off
USES= compiler:c++14-lang cmake desktop-file-utils iconv localbase:ldflags pkgconfig shared-mime-info ssl
USES= cmake compiler:c++17-lang desktop-file-utils gnome gl iconv \
localbase:ldflags pkgconfig sdl shared-mime-info ssl
USE_GITHUB= yes
GH_ACCOUNT= OpenRCT2
GH_PROJECT= OpenRCT2
GH_TUPLE= OpenRCT2:objects:v1.0.10:objects \
OpenRCT2:title-sequences:v0.1.2a:title_sequences
USE_GL= gl
USE_LDCONFIG= yes
USE_SDL= sdl2
INSTALLS_ICONS= yes
SUB_FILES= pkg-message
SUB_LIST= DISTVERSIONPREFIX=${DISTVERSIONPREFIX} \
DISTVERSION=${DISTVERSION} \
PORTNAME=${PORTNAME}
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_OFF= DOWNLOAD_TITLE_SEQUENCES
CMAKE_OFF= DOWNLOAD_TITLE_SEQUENCES \
DOWNLOAD_OBJECTS
CXXFLAGS+= -D_GNU_SOURCE
PORTDATA= *
PORTDOCS= changelog.txt contributors.md licence.txt readme.txt
INSTALLS_ICONS= yes
OPTIONS_DEFINE= DOCS
PORTDOCS= changelog.txt contributors.md licence.txt readme.txt
post-patch:
@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
${WRKSRC}/src/openrct2/config/Config.cpp
post-install:
(cd ${WRKDIR}/title-sequences-0.1.2a; \
${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/title)
(cd ${WRKDIR}/objects-1.0.10; \
${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/object)
.include <bsd.port.mk>

10
games/openrct2/distinfo
View File

@ -1,3 +1,7 @@
TIMESTAMP = 1521471656
SHA256 (OpenRCT2-OpenRCT2-v0.1.2_GH0.tar.gz) = 358fc0ceff848734b399dc63c1d7a0c096a54a793afe4522d6f0dd00ba9328c7
SIZE (OpenRCT2-OpenRCT2-v0.1.2_GH0.tar.gz) = 6769785
TIMESTAMP = 1556126577
SHA256 (OpenRCT2-OpenRCT2-v0.2.2_GH0.tar.gz) = 4b7b003fc0cf365be8a43d8784827415dbba3335de59cb948ab720ec1ebcaa7b
SIZE (OpenRCT2-OpenRCT2-v0.2.2_GH0.tar.gz) = 8064579
SHA256 (OpenRCT2-objects-v1.0.10_GH0.tar.gz) = a79e3a40b59a79e024f76dd1eae70b6e5009a53c11fe3909609e4564fafdcf6c
SIZE (OpenRCT2-objects-v1.0.10_GH0.tar.gz) = 637654
SHA256 (OpenRCT2-title-sequences-v0.1.2a_GH0.tar.gz) = 83e935186435116d6ea79e48daeea99c1158800a3fa92069100cfb8dbd80c9d7
SIZE (OpenRCT2-title-sequences-v0.1.2a_GH0.tar.gz) = 21298525

707
games/openrct2/files/patch-bigendian Normal file
View File

@ -0,0 +1,707 @@
--- src/openrct2-ui/input/KeyboardShortcuts.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2-ui/input/KeyboardShortcuts.cpp
@@ -19,6 +19,7 @@
#include <openrct2/core/Path.hpp>
#include <openrct2/core/String.hpp>
#include <openrct2/localisation/Localisation.h>
+#include <openrct2/util/Endian.h>
using namespace OpenRCT2;
using namespace OpenRCT2::Input;
@@ -55,14 +56,14 @@ bool KeyboardShortcuts::Load()
if (File::Exists(path))
{
auto fs = FileStream(path, FILE_MODE_OPEN);
- uint16_t version = fs.ReadValue<uint16_t>();
+ uint16_t version = ORCT_SwapLEu16(fs.ReadValue<uint16_t>());
if (version == KeyboardShortcuts::CURRENT_FILE_VERSION)
{
int32_t numShortcutsInFile = (fs.GetLength() - sizeof(uint16_t)) / sizeof(uint16_t);
int32_t numShortcutsToRead = std::min<int32_t>(SHORTCUT_COUNT, numShortcutsInFile);
for (int32_t i = 0; i < numShortcutsToRead; i++)
{
- _keys[i] = fs.ReadValue<uint16_t>();
+ _keys[i] = ORCT_SwapLEu16(fs.ReadValue<uint16_t>());
}
result = true;
}
--- src/openrct2/audio/Audio.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/audio/Audio.cpp
@@ -23,6 +23,7 @@
#include "../peep/Peep.h"
#include "../ride/Ride.h"
#include "../ui/UiContext.h"
+#include "../util/Endian.h"
#include "../util/Util.h"
#include "AudioContext.h"
#include "AudioMixer.h"
@@ -350,7 +351,7 @@ void audio_init_ride_sounds_and_info()
try
{
auto fs = FileStream(path, FILE_MODE_OPEN);
- uint32_t head = fs.ReadValue<uint32_t>();
+ uint32_t head = ORCT_SwapLEu32(fs.ReadValue<uint32_t>());
if (head == 0x78787878)
{
rideMusicInfo.length = 0;
--- src/openrct2/common.h.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/common.h
@@ -75,6 +75,10 @@ const constexpr auto ror64 = ror<uint64_
# define RCT2_ENDIANESS __ORDER_LITTLE_ENDIAN__
# define LOBYTE(w) ((uint8_t)(w))
# define HIBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF))
+# else
+# define RCT2_ENDIANESS __ORDER_BIG_ENDIAN__
+# define HIBYTE(w) ((uint8_t)(w))
+# define LOBYTE(w) ((uint8_t)(((uint16_t)(w) >> 8) & 0xFF))
# endif // __BYTE_ORDER__
# ifndef RCT2_ENDIANESS
--- src/openrct2/core/FileIndex.hpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/core/FileIndex.hpp
@@ -10,6 +10,7 @@
#pragma once
#include "../common.h"
+#include "../util/Endian.h"
#include "Console.hpp"
#include "File.h"
#include "FileScanner.h"
@@ -265,6 +266,14 @@ private:
// Read header, check if we need to re-scan
auto header = fs.ReadValue<FileIndexHeader>();
+ header.HeaderSize = ORCT_SwapLEu32(header.HeaderSize);
+ header.MagicNumber = ORCT_SwapLEu32(header.MagicNumber);
+ header.LanguageId = ORCT_SwapLEu16(header.LanguageId);
+ header.NumItems = ORCT_SwapLEu32(header.NumItems);
+ header.Stats.TotalFiles = ORCT_SwapLEu32(header.Stats.TotalFiles);
+ header.Stats.TotalFileSize = ORCT_SwapLEu64(header.Stats.TotalFileSize);
+ header.Stats.FileDateModifiedChecksum = ORCT_SwapLEu32(header.Stats.FileDateModifiedChecksum);
+ header.Stats.PathChecksum = ORCT_SwapLEu32(header.Stats.PathChecksum);
if (header.HeaderSize == sizeof(FileIndexHeader) && header.MagicNumber == _magicNumber
&& header.VersionA == FILE_INDEX_VERSION && header.VersionB == _version && header.LanguageId == language
&& header.Stats.TotalFiles == stats.TotalFiles && header.Stats.TotalFileSize == stats.TotalFileSize
--- src/openrct2/drawing/Drawing.Sprite.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/drawing/Drawing.Sprite.cpp
@@ -16,6 +16,7 @@
#include "../platform/platform.h"
#include "../sprites.h"
#include "../ui/UiContext.h"
+#include "../util/Endian.h"
#include "../util/Util.h"
#include "Drawing.h"
@@ -237,6 +238,8 @@ bool gfx_load_g1(const IPlatformEnvironm
auto path = Path::Combine(env.GetDirectoryPath(DIRBASE::RCT2, DIRID::DATA), "g1.dat");
auto fs = FileStream(path, FILE_MODE_OPEN);
_g1.header = fs.ReadValue<rct_g1_header>();
+ _g1.header.num_entries = ORCT_SwapLEu32(_g1.header.num_entries);
+ _g1.header.total_size = ORCT_SwapLEu32(_g1.header.total_size);
log_verbose("g1.dat, number of entries: %u", _g1.header.num_entries);
@@ -309,6 +312,8 @@ bool gfx_load_g2()
{
auto fs = FileStream(path, FILE_MODE_OPEN);
_g2.header = fs.ReadValue<rct_g1_header>();
+ _g2.header.num_entries = ORCT_SwapLEu32(_g2.header.num_entries);
+ _g2.header.total_size = ORCT_SwapLEu32(_g2.header.total_size);
// Read element headers
_g2.elements.resize(_g2.header.num_entries);
--- src/openrct2/object/BannerObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/BannerObject.cpp
@@ -14,6 +14,7 @@
#include "../localisation/Language.h"
#include "../object/Object.h"
#include "../object/ObjectRepository.h"
+#include "../util/Endian.h"
#include "ObjectJsonHelpers.h"
#include "ObjectList.h"
@@ -22,13 +23,14 @@ void BannerObject::ReadLegacy(IReadObjec
stream->Seek(6, STREAM_SEEK_CURRENT);
_legacyType.banner.scrolling_mode = stream->ReadValue<uint8_t>();
_legacyType.banner.flags = stream->ReadValue<uint8_t>();
- _legacyType.banner.price = stream->ReadValue<int16_t>();
+ _legacyType.banner.price = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
_legacyType.banner.scenery_tab_id = stream->ReadValue<uint8_t>();
stream->Seek(1, STREAM_SEEK_CURRENT);
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
+ sgEntry.flags = ORCT_SwapLEu32(sgEntry.flags);
SetPrimarySceneryGroup(&sgEntry);
GetImageTable().Read(context, stream);
--- src/openrct2/object/FootpathItemObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/FootpathItemObject.cpp
@@ -15,6 +15,7 @@
#include "../localisation/Localisation.h"
#include "../object/Object.h"
#include "../object/ObjectRepository.h"
+#include "../util/Endian.h"
#include "ObjectJsonHelpers.h"
#include "ObjectList.h"
@@ -23,16 +24,17 @@
void FootpathItemObject::ReadLegacy(IReadObjectContext* context, IStream* stream)
{
stream->Seek(6, STREAM_SEEK_CURRENT);
- _legacyType.path_bit.flags = stream->ReadValue<uint16_t>();
+ _legacyType.path_bit.flags = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
_legacyType.path_bit.draw_type = stream->ReadValue<uint8_t>();
_legacyType.path_bit.tool_id = stream->ReadValue<uint8_t>();
- _legacyType.path_bit.price = stream->ReadValue<int16_t>();
+ _legacyType.path_bit.price = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
_legacyType.path_bit.scenery_tab_id = stream->ReadValue<uint8_t>();
stream->Seek(1, STREAM_SEEK_CURRENT);
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
+ sgEntry.flags = ORCT_SwapLEu32(sgEntry.flags);
SetPrimarySceneryGroup(&sgEntry);
GetImageTable().Read(context, stream);
--- src/openrct2/object/ImageTable.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/ImageTable.cpp
@@ -11,6 +11,7 @@
#include "../OpenRCT2.h"
#include "../core/IStream.hpp"
+#include "../util/Endian.h"
#include "Object.h"
#include <algorithm>
@@ -37,8 +38,8 @@ void ImageTable::Read(IReadObjectContext
try
{
- uint32_t numImages = stream->ReadValue<uint32_t>();
- uint32_t imageDataSize = stream->ReadValue<uint32_t>();
+ uint32_t numImages = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
+ uint32_t imageDataSize = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
uint64_t headerTableSize = numImages * 16;
uint64_t remainingBytes = stream->GetLength() - stream->GetPosition() - headerTableSize;
@@ -63,15 +64,15 @@ void ImageTable::Read(IReadObjectContext
{
rct_g1_element g1Element;
- uintptr_t imageDataOffset = (uintptr_t)stream->ReadValue<uint32_t>();
+ uintptr_t imageDataOffset = ORCT_SwapLEu32((uintptr_t)stream->ReadValue<uint32_t>());
g1Element.offset = (uint8_t*)(imageDataBase + imageDataOffset);
- g1Element.width = stream->ReadValue<int16_t>();
- g1Element.height = stream->ReadValue<int16_t>();
- g1Element.x_offset = stream->ReadValue<int16_t>();
- g1Element.y_offset = stream->ReadValue<int16_t>();
- g1Element.flags = stream->ReadValue<uint16_t>();
- g1Element.zoomed_offset = stream->ReadValue<uint16_t>();
+ g1Element.width = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
+ g1Element.height = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
+ g1Element.x_offset = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
+ g1Element.y_offset = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
+ g1Element.flags = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
+ g1Element.zoomed_offset = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
newEntries.push_back(g1Element);
}
--- src/openrct2/object/LargeSceneryObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/LargeSceneryObject.cpp
@@ -16,6 +16,7 @@
#include "../drawing/Drawing.h"
#include "../interface/Cursors.h"
#include "../localisation/Language.h"
+#include "../util/Endian.h"
#include "../world/Banner.h"
#include "../world/Location.hpp"
#include "ObjectJsonHelpers.h"
@@ -28,8 +29,8 @@ void LargeSceneryObject::ReadLegacy(IRea
stream->Seek(6, STREAM_SEEK_CURRENT);
_legacyType.large_scenery.tool_id = stream->ReadValue<uint8_t>();
_legacyType.large_scenery.flags = stream->ReadValue<uint8_t>();
- _legacyType.large_scenery.price = stream->ReadValue<int16_t>();
- _legacyType.large_scenery.removal_price = stream->ReadValue<int16_t>();
+ _legacyType.large_scenery.price = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
+ _legacyType.large_scenery.removal_price = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
stream->Seek(5, STREAM_SEEK_CURRENT);
_legacyType.large_scenery.scenery_tab_id = 0xFF;
_legacyType.large_scenery.scrolling_mode = stream->ReadValue<uint8_t>();
@@ -38,6 +39,7 @@ void LargeSceneryObject::ReadLegacy(IRea
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
+ sgEntry.flags = ORCT_SwapLEu32(sgEntry.flags);
SetPrimarySceneryGroup(&sgEntry);
if (_legacyType.large_scenery.flags & LARGE_SCENERY_FLAG_3D_TEXT)
@@ -112,10 +114,17 @@ void LargeSceneryObject::DrawPreview(rct
std::vector<rct_large_scenery_tile> LargeSceneryObject::ReadTiles(IStream* stream)
{
auto tiles = std::vector<rct_large_scenery_tile>();
+ // Note: no need to swap the value here...
while (stream->ReadValue<uint16_t>() != 0xFFFF)
{
stream->Seek(-2, STREAM_SEEK_CURRENT);
+
auto tile = stream->ReadValue<rct_large_scenery_tile>();
+ tile.x_offset = ORCT_SwapLEi16(tile.x_offset);
+ tile.y_offset = ORCT_SwapLEi16(tile.y_offset);
+ tile.z_offset = ORCT_SwapLEi16(tile.z_offset);
+ tile.z_clearance = ORCT_SwapLEi16(tile.z_clearance);
+ tile.flags = ORCT_SwapLEi16(tile.flags);
tiles.push_back(tile);
}
tiles.push_back({ -1, -1, -1, 255, 0xFFFF });
--- src/openrct2/object/ObjectFactory.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/ObjectFactory.cpp
@@ -20,6 +20,7 @@
#include "../core/String.hpp"
#include "../core/Zip.h"
#include "../rct12/SawyerChunkReader.h"
+#include "../util/Endian.h"
#include "BannerObject.h"
#include "EntranceObject.h"
#include "FootpathItemObject.h"
--- src/openrct2/object/ObjectRepository.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/ObjectRepository.cpp
@@ -29,6 +29,7 @@
#include "../rct12/SawyerChunkReader.h"
#include "../rct12/SawyerChunkWriter.h"
#include "../scenario/ScenarioRepository.h"
+#include "../util/Endian.h"
#include "../util/SawyerCoding.h"
#include "../util/Util.h"
#include "Object.h"
@@ -161,6 +162,7 @@ protected:
ObjectRepositoryItem item;
item.ObjectEntry = stream->ReadValue<rct_object_entry>();
+ item.ObjectEntry.flags = ORCT_SwapLEu32(item.ObjectEntry.flags);
item.Path = stream->ReadStdString();
item.Name = stream->ReadStdString();
auto sourceLength = stream->ReadValue<uint8_t>();
@@ -186,11 +188,12 @@ protected:
break;
case OBJECT_TYPE_SCENERY_GROUP:
{
- auto numEntries = stream->ReadValue<uint16_t>();
+ auto numEntries = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
item.SceneryGroupInfo.Entries = std::vector<rct_object_entry>(numEntries);
for (size_t i = 0; i < numEntries; i++)
{
item.SceneryGroupInfo.Entries[i] = stream->ReadValue<rct_object_entry>();
+ item.SceneryGroupInfo.Entries[i].flags = ORCT_SwapLEu32(item.SceneryGroupInfo.Entries[i].flags);
}
break;
}
@@ -363,6 +366,7 @@ public:
// Check if we already have this object
rct_object_entry entry = stream->ReadValue<rct_object_entry>();
+ entry.flags = ORCT_SwapLEu32(entry.flags);
if (FindObject(&entry) != nullptr)
{
chunkReader.SkipChunk();
@@ -622,6 +626,7 @@ private:
// Read object data from file
auto fs = FileStream(item->Path, FILE_MODE_OPEN);
auto fileEntry = fs.ReadValue<rct_object_entry>();
+ fileEntry.flags = ORCT_SwapLEu32(fileEntry.flags);
if (!object_entry_compare(entry, &fileEntry))
{
throw std::runtime_error("Header found in object file does not match object to pack.");
--- src/openrct2/object/RideObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/RideObject.cpp
@@ -22,6 +22,7 @@
#include "../ride/RideGroupManager.h"
#include "../ride/ShopItem.h"
#include "../ride/Track.h"
+#include "../util/Endian.h"
#include "ObjectJsonHelpers.h"
#include "ObjectRepository.h"
@@ -34,7 +35,7 @@ using namespace OpenRCT2;
void RideObject::ReadLegacy(IReadObjectContext* context, IStream* stream)
{
stream->Seek(8, STREAM_SEEK_CURRENT);
- _legacyType.flags = stream->ReadValue<uint32_t>();
+ _legacyType.flags = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
for (auto& rideType : _legacyType.ride_type)
{
rideType = stream->ReadValue<uint8_t>();
@@ -59,7 +60,7 @@ void RideObject::ReadLegacy(IReadObjectC
_legacyType.intensity_multiplier = stream->ReadValue<int8_t>();
_legacyType.nausea_multiplier = stream->ReadValue<int8_t>();
_legacyType.max_height = stream->ReadValue<uint8_t>();
- _legacyType.enabledTrackPieces = stream->ReadValue<uint64_t>();
+ _legacyType.enabledTrackPieces = ORCT_SwapLEu64(stream->ReadValue<uint64_t>());
_legacyType.category[0] = stream->ReadValue<uint8_t>();
_legacyType.category[1] = stream->ReadValue<uint8_t>();
_legacyType.shop_item = stream->ReadValue<uint8_t>();
@@ -94,7 +95,7 @@ void RideObject::ReadLegacy(IReadObjectC
uint16_t numPeepLoadingPositions = stream->ReadValue<uint8_t>();
if (numPeepLoadingPositions == 255)
{
- numPeepLoadingPositions = stream->ReadValue<uint16_t>();
+ numPeepLoadingPositions = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
}
if (_legacyType.vehicles[i].flags & VEHICLE_ENTRY_FLAG_LOADING_WAYPOINTS)
@@ -116,7 +117,7 @@ void RideObject::ReadLegacy(IReadObjectC
entry[1].y = stream->ReadValue<int8_t>();
entry[2].x = stream->ReadValue<int8_t>();
entry[2].y = stream->ReadValue<int8_t>();
- stream->ReadValue<uint16_t>(); // Skip blanks
+ stream->ReadValue<uint16_t>(); // Skip blanks, no need to swap endianess
_peepLoadingWaypoints[i].push_back(entry);
}
@@ -412,19 +413,19 @@ void RideObject::SetRepositoryItem(Objec
void RideObject::ReadLegacyVehicle(
[[maybe_unused]] IReadObjectContext* context, IStream* stream, rct_ride_entry_vehicle* vehicle)
{
- vehicle->rotation_frame_mask = stream->ReadValue<uint16_t>();
+ vehicle->rotation_frame_mask = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
stream->Seek(2 * 1, STREAM_SEEK_CURRENT);
- vehicle->spacing = stream->ReadValue<uint32_t>();
- vehicle->car_mass = stream->ReadValue<uint16_t>();
+ vehicle->spacing = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
+ vehicle->car_mass = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
vehicle->tab_height = stream->ReadValue<int8_t>();
vehicle->num_seats = stream->ReadValue<uint8_t>();
- vehicle->sprite_flags = stream->ReadValue<uint16_t>();
+ vehicle->sprite_flags = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
vehicle->sprite_width = stream->ReadValue<uint8_t>();
vehicle->sprite_height_negative = stream->ReadValue<uint8_t>();
vehicle->sprite_height_positive = stream->ReadValue<uint8_t>();
vehicle->animation = stream->ReadValue<uint8_t>();
- vehicle->flags = stream->ReadValue<uint32_t>();
- vehicle->base_num_frames = stream->ReadValue<uint16_t>();
+ vehicle->flags = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
+ vehicle->base_num_frames = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
stream->Seek(15 * 4, STREAM_SEEK_CURRENT);
vehicle->no_seating_rows = stream->ReadValue<uint8_t>();
vehicle->spinning_inertia = stream->ReadValue<uint8_t>();
--- src/openrct2/object/SceneryGroupObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/SceneryGroupObject.cpp
@@ -18,6 +18,7 @@
#include "../drawing/Drawing.h"
#include "../localisation/Language.h"
#include "../peep/Staff.h"
+#include "../util/Endian.h"
#include "ObjectJsonHelpers.h"
#include "ObjectManager.h"
#include "ObjectRepository.h"
@@ -34,7 +35,7 @@ void SceneryGroupObject::ReadLegacy(IRea
_legacyType.pad_107 = stream->ReadValue<uint8_t>();
_legacyType.priority = stream->ReadValue<uint8_t>();
_legacyType.pad_109 = stream->ReadValue<uint8_t>();
- _legacyType.entertainer_costumes = stream->ReadValue<uint32_t>();
+ _legacyType.entertainer_costumes = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
_items = ReadItems(stream);
@@ -126,6 +127,7 @@ std::vector<rct_object_entry> SceneryGro
{
stream->Seek(-1, STREAM_SEEK_CURRENT);
auto entry = stream->ReadValue<rct_object_entry>();
+ entry.flags = ORCT_SwapLEu32(entry.flags);
items.push_back(entry);
}
return items;
--- src/openrct2/object/SmallSceneryObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/SmallSceneryObject.cpp
@@ -17,6 +17,7 @@
#include "../drawing/Drawing.h"
#include "../interface/Cursors.h"
#include "../localisation/Language.h"
+#include "../util/Endian.h"
#include "../world/Scenery.h"
#include "../world/SmallScenery.h"
#include "ObjectJsonHelpers.h"
@@ -26,20 +27,21 @@
void SmallSceneryObject::ReadLegacy(IReadObjectContext* context, IStream* stream)
{
stream->Seek(6, STREAM_SEEK_CURRENT);
- _legacyType.small_scenery.flags = stream->ReadValue<uint32_t>();
+ _legacyType.small_scenery.flags = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
_legacyType.small_scenery.height = stream->ReadValue<uint8_t>();
_legacyType.small_scenery.tool_id = stream->ReadValue<uint8_t>();
- _legacyType.small_scenery.price = stream->ReadValue<int16_t>();
- _legacyType.small_scenery.removal_price = stream->ReadValue<int16_t>();
+ _legacyType.small_scenery.price = ORCT_SwapLEu16(stream->ReadValue<int16_t>());
+ _legacyType.small_scenery.removal_price = ORCT_SwapLEu16(stream->ReadValue<int16_t>());
stream->Seek(4, STREAM_SEEK_CURRENT);
- _legacyType.small_scenery.animation_delay = stream->ReadValue<uint16_t>();
- _legacyType.small_scenery.animation_mask = stream->ReadValue<uint16_t>();
- _legacyType.small_scenery.num_frames = stream->ReadValue<uint16_t>();
+ _legacyType.small_scenery.animation_delay = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
+ _legacyType.small_scenery.animation_mask = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
+ _legacyType.small_scenery.num_frames = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
_legacyType.small_scenery.scenery_tab_id = 0xFF;
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
+ sgEntry.flags = ORCT_SwapLEu32(sgEntry.flags);
SetPrimarySceneryGroup(&sgEntry);
if (scenery_small_entry_has_flag(&_legacyType, SMALL_SCENERY_FLAG_HAS_FRAME_OFFSETS))
--- src/openrct2/object/WallObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/WallObject.cpp
@@ -13,6 +13,7 @@
#include "../drawing/Drawing.h"
#include "../interface/Cursors.h"
#include "../localisation/Language.h"
+#include "../util/Endian.h"
#include "../world/Banner.h"
#include "ObjectJsonHelpers.h"
@@ -23,13 +24,14 @@ void WallObject::ReadLegacy(IReadObjectC
_legacyType.wall.flags = stream->ReadValue<uint8_t>();
_legacyType.wall.height = stream->ReadValue<uint8_t>();
_legacyType.wall.flags2 = stream->ReadValue<uint8_t>();
- _legacyType.wall.price = stream->ReadValue<uint16_t>();
+ _legacyType.wall.price = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
_legacyType.wall.scenery_tab_id = stream->ReadValue<uint8_t>();
_legacyType.wall.scrolling_mode = stream->ReadValue<uint8_t>();
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
+ sgEntry.flags = ORCT_SwapLEu16(sgEntry.flags);
SetPrimarySceneryGroup(&sgEntry);
GetImageTable().Read(context, stream);
--- src/openrct2/object/WaterObject.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/object/WaterObject.cpp
@@ -15,6 +15,7 @@
#include "../core/IStream.hpp"
#include "../localisation/Language.h"
#include "../localisation/StringIds.h"
+#include "../util/Endian.h"
#include "ObjectJsonHelpers.h"
#include <memory>
@@ -22,7 +23,7 @@
void WaterObject::ReadLegacy(IReadObjectContext* context, IStream* stream)
{
stream->Seek(14, STREAM_SEEK_CURRENT);
- _legacyType.flags = stream->ReadValue<uint16_t>();
+ _legacyType.flags = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
GetImageTable().Read(context, stream);
--- src/openrct2/rct12/SawyerChunkReader.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/rct12/SawyerChunkReader.cpp
@@ -10,6 +10,7 @@
#include "SawyerChunkReader.h"
#include "../core/IStream.hpp"
+#include "../util/Endian.h"
// malloc is very slow for large allocations in MSVC debug builds as it allocates
// memory on a special debug heap and then initialises all the memory to 0xCC.
@@ -52,6 +53,7 @@ void SawyerChunkReader::SkipChunk()
try
{
auto header = _stream->ReadValue<sawyercoding_chunk_header>();
+ header.length = ORCT_SwapLEu32(header.length);
_stream->Seek(header.length, STREAM_SEEK_CURRENT);
}
catch (const std::exception&)
@@ -68,6 +70,7 @@ std::shared_ptr<SawyerChunk> SawyerChunk
try
{
auto header = _stream->ReadValue<sawyercoding_chunk_header>();
+ header.length = ORCT_SwapLEu32(header.length);
switch (header.encoding)
{
case CHUNK_ENCODING_NONE:
--- src/openrct2/rct12/SawyerEncoding.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/rct12/SawyerEncoding.cpp
@@ -10,6 +10,7 @@
#include "SawyerEncoding.h"
#include "../core/IStream.hpp"
+#include "../util/Endian.h"
#include <algorithm>
@@ -44,7 +45,7 @@ namespace SawyerEncoding
} while (dataSize != 0);
// Read file checksum
- uint32_t fileChecksum = stream->ReadValue<uint32_t>();
+ uint32_t fileChecksum = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
// Rewind back to original position
stream->SetPosition(initialPosition);
--- src/openrct2/ride/TrackDesignRepository.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/ride/TrackDesignRepository.cpp
@@ -22,6 +22,7 @@
#include "../localisation/LocalisationService.h"
#include "../object/ObjectRepository.h"
#include "../object/RideObject.h"
+#include "../util/Endian.h"
#include "RideGroupManager.h"
#include "TrackDesign.h"
@@ -114,7 +115,7 @@ protected:
item.Path = stream->ReadStdString();
item.RideType = stream->ReadValue<uint8_t>();
item.ObjectEntry = stream->ReadStdString();
- item.Flags = stream->ReadValue<uint32_t>();
+ item.Flags = ORCT_SwapLEu32(stream->ReadValue<uint32_t>());
return item;
}
--- src/openrct2/scenario/ScenarioRepository.cpp.orig 2019-03-13 20:51:10 UTC
+++ src/openrct2/scenario/ScenarioRepository.cpp
@@ -25,6 +25,7 @@
#include "../localisation/LocalisationService.h"
#include "../platform/platform.h"
#include "../rct12/SawyerChunkReader.h"
+#include "../util/Endian.h"
#include "Scenario.h"
#include "ScenarioSources.h"
@@ -182,17 +183,17 @@ protected:
scenario_index_entry item;
stream->Read(item.path, sizeof(item.path));
- item.timestamp = stream->ReadValue<uint64_t>();
+ item.timestamp = ORCT_SwapLEu64(stream->ReadValue<uint64_t>());
item.category = stream->ReadValue<uint8_t>();
item.source_game = stream->ReadValue<uint8_t>();
- item.source_index = stream->ReadValue<int16_t>();
- item.sc_id = stream->ReadValue<uint16_t>();
+ item.source_index = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
+ item.sc_id = ORCT_SwapLEu16(stream->ReadValue<uint16_t>());
item.objective_type = stream->ReadValue<uint8_t>();
item.objective_arg_1 = stream->ReadValue<uint8_t>();
- item.objective_arg_2 = stream->ReadValue<int32_t>();
- item.objective_arg_3 = stream->ReadValue<int16_t>();
+ item.objective_arg_2 = ORCT_SwapLEi32(stream->ReadValue<int32_t>());
+ item.objective_arg_3 = ORCT_SwapLEi16(stream->ReadValue<int16_t>());
item.highscore = nullptr;
stream->Read(item.internal_name, sizeof(item.internal_name));
@@ -587,7 +588,7 @@ private:
try
{
auto fs = FileStream(path, FILE_MODE_OPEN);
- uint32_t fileVersion = fs.ReadValue<uint32_t>();
+ uint32_t fileVersion = ORCT_SwapLEu32(fs.ReadValue<uint32_t>());
if (fileVersion != 1)
{
Console::Error::WriteLine("Invalid or incompatible highscores file.");
@@ -596,14 +597,14 @@ private:
ClearHighscores();
- uint32_t numHighscores = fs.ReadValue<uint32_t>();
+ uint32_t numHighscores = ORCT_SwapLEu32(fs.ReadValue<uint32_t>());
for (uint32_t i = 0; i < numHighscores; i++)
{
scenario_highscore_entry* highscore = InsertHighscore();
highscore->fileName = fs.ReadString();
highscore->name = fs.ReadString();
- highscore->company_value = fs.ReadValue<money32>();
- highscore->timestamp = fs.ReadValue<datetime64>();
+ highscore->company_value = ORCT_SwapLEi32(fs.ReadValue<money32>());
+ highscore->timestamp = ORCT_SwapLEu64(fs.ReadValue<datetime64>());
}
}
catch (const std::exception&)
@@ -647,6 +648,10 @@ private:
{
// Read legacy entry
auto scBasic = fs.ReadValue<rct_scores_entry>();
+ scBasic.objectiveArg2 = ORCT_SwapLEi32(scBasic.objectiveArg2);
+ scBasic.objectiveArg3 = ORCT_SwapLEi16(scBasic.objectiveArg3);
+ scBasic.Flags = ORCT_SwapLEi32(scBasic.Flags);
+ scBasic.CompanyValue = ORCT_SwapLEi32(scBasic.CompanyValue);
// Ignore non-completed scenarios
if (scBasic.Flags & SCENARIO_FLAGS_COMPLETED)
--- src/openrct2/util/Endian.h.orig 2019-04-04 08:21:55 UTC
+++ src/openrct2/util/Endian.h
@@ -0,0 +1,70 @@
+#include <cstdint>
+
+#pragma once
+
+// Based on SDL2
+
+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
+
+static inline uint16_t ORCT_Swapu16(uint16_t x)
+{
+ return static_cast<uint16_t>((x << 8) | (x >> 8));
+}
+
+static inline uint32_t ORCT_Swapu32(uint32_t x)
+{
+ return static_cast<uint32_t>(((x << 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x >> 24)));
+}
+
+static inline uint64_t ORCT_Swapu64(uint64_t x)
+{
+ uint32_t hi, lo;
+
+ /* Separate into high and low 32-bit values and swap them */
+ lo = static_cast<uint32_t>(x & 0xFFFFFFFF);
+ x >>= 32;
+ hi = static_cast<uint32_t>(x & 0xFFFFFFFF);
+ x = ORCT_Swapu32(lo);
+ x <<= 32;
+ x |= ORCT_Swapu32(hi);
+ return (x);
+}
+
+static inline int16_t ORCT_Swapi16(int16_t x)
+{
+ return static_cast<uint16_t>((x << 8) | (x >> 8));
+}
+
+static inline int32_t ORCT_Swapi32(int32_t x)
+{
+ return static_cast<uint32_t>(((x << 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x >> 24)));
+}
+
+static inline int64_t ORCT_Swapi64(int64_t x)
+{
+ uint32_t hi, lo;
+
+ /* Separate into high and low 32-bit values and swap them */
+ lo = static_cast<uint32_t>(x & 0xFFFFFFFF);
+ x >>= 32;
+ hi = static_cast<uint32_t>(x & 0xFFFFFFFF);
+ x = ORCT_Swapu32(lo);
+ x <<= 32;
+ x |= ORCT_Swapu32(hi);
+ return (x);
+}
+
+# define ORCT_SwapLEi16(X) ORCT_Swapi16(X)
+# define ORCT_SwapLEi32(X) ORCT_Swapi32(X)
+# define ORCT_SwapLEi64(X) ORCT_Swapi64(X)
+# define ORCT_SwapLEu16(X) ORCT_Swapu16(X)
+# define ORCT_SwapLEu32(X) ORCT_Swapu32(X)
+# define ORCT_SwapLEu64(X) ORCT_Swapu64(X)
+#else
+# define ORCT_SwapLEi16(X) (X)
+# define ORCT_SwapLEi32(X) (X)
+# define ORCT_SwapLEi64(X) (X)
+# define ORCT_SwapLEu16(X) (X)
+# define ORCT_SwapLEu32(X) (X)
+# define ORCT_SwapLEu64(X) (X)
+#endif

6
games/openrct2/files/patch-src_openrct2_config_Config.cpp
View File

@ -1,6 +1,6 @@
--- src/openrct2/config/Config.cpp.orig 2018-03-18 20:26:14 UTC
--- src/openrct2/config/Config.cpp.orig 2018-08-26 20:20:13 UTC
+++ src/openrct2/config/Config.cpp
@@ -602,6 +602,9 @@ namespace Config
@@ -650,6 +650,9 @@ namespace Config
*/
static std::string FindRCT2Path()
{
@ -9,4 +9,4 @@
+
log_verbose("config_find_rct2_path(...)");
static constexpr const utf8 * searchLocations[] =
static constexpr const utf8* searchLocations[] = {

14
games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp
View File

@ -1,14 +0,0 @@
--- src/openrct2/platform/Platform.Linux.cpp.orig 2018-03-18 20:26:14 UTC
+++ src/openrct2/platform/Platform.Linux.cpp
@@ -16,6 +16,11 @@
#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__linux__) && !defined(__ANDROID__))
+#ifdef __FreeBSD__
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
#include <limits.h>
#include <pwd.h>
#include "../core/Path.hpp"

11
games/openrct2/files/patch-src_openrct2_util_Util.cpp
View File

@ -1,11 +0,0 @@
--- src/openrct2/util/Util.cpp.orig 2018-03-18 20:26:14 UTC
+++ src/openrct2/util/Util.cpp
@@ -222,7 +222,7 @@ bool avx2_available()
// https://github.com/gcc-mirror/gcc/commit/132fa33ce998df69a9f793d63785785f4b93e6f1
// which causes it to ignore subleafs, but the new function is unavailable on Ubuntu's
// prehistoric toolchains
-#if defined(OpenRCT2_CPUID_GNUC_X86)
+#if defined(OpenRCT2_CPUID_GNUC_X86) && (!defined(__FreeBSD__) || (__FreeBSD__ > 10))
return __builtin_cpu_supports("avx2");
#else
// AVX2 support is declared as the 5th bit of EBX with CPUID(EAX = 7, ECX = 0).

10
games/openrct2/files/pkg-message.in
View File

@ -1,10 +0,0 @@
================================================================================
To complete the installation of this port, you need to download the file
https://github.com/OpenRCT2/title-sequences/releases/download/%%DISTVERSIONPREFIX%%%%DISTVERSION%%/title-sequence-%%DISTVERSIONPREFIX%%%%DISTVERSION%%.zip
and unpack it to %%PREFIX%%/share/%%PORTNAME%%/title.
You need to follow https://openrct2.website/getting-started/index.html
to finish installation.
================================================================================

2
games/openrct2/pkg-descr
View File

@ -1,4 +1,4 @@
An open-source re-implementation of RollerCoaster Tycoon 2. A construction and
management simulation video game that simulates amusement park management.
WWW: https://openrct2.website/
WWW: https://openrct2.io

6
games/openrct2/pkg-message Normal file
View File

@ -0,0 +1,6 @@
================================================================================
You need to follow https://openrct2.io/getting-started/index.html to finish
installation.
================================================================================

30
games/openrct2/pkg-plist
View File

@ -17,33 +17,3 @@ share/icons/hicolor/96x96/apps/openrct2.png
share/icons/hicolor/scalable/apps/openrct2.svg
share/metainfo/openrct2.appdata.xml
share/mime/packages/openrct2.xml
%%DATADIR%%/g2.dat
%%DATADIR%%/language/ar-EG.txt
%%DATADIR%%/language/ca-ES.txt
%%DATADIR%%/language/cs-CZ.txt
%%DATADIR%%/language/de-DE.txt
%%DATADIR%%/language/en-GB.txt
%%DATADIR%%/language/en-US.txt
%%DATADIR%%/language/es-ES.txt
%%DATADIR%%/language/fi-FI.txt
%%DATADIR%%/language/fr-FR.txt
%%DATADIR%%/language/hu-HU.txt
%%DATADIR%%/language/it-IT.txt
%%DATADIR%%/language/ja-JP.txt
%%DATADIR%%/language/ko-KR.txt
%%DATADIR%%/language/nb-NO.txt
%%DATADIR%%/language/nl-NL.txt
%%DATADIR%%/language/pl-PL.txt
%%DATADIR%%/language/pt-BR.txt
%%DATADIR%%/language/ru-RU.txt
%%DATADIR%%/language/sv-SE.txt
%%DATADIR%%/language/zh-CN.txt
%%DATADIR%%/language/zh-TW.txt
%%DATADIR%%/shaders/applypalette.frag
%%DATADIR%%/shaders/applypalette.vert
%%DATADIR%%/shaders/applytransparency.frag
%%DATADIR%%/shaders/applytransparency.vert
%%DATADIR%%/shaders/drawline.frag
%%DATADIR%%/shaders/drawline.vert
%%DATADIR%%/shaders/drawrect.frag
%%DATADIR%%/shaders/drawrect.vert

33
games/supertux2/Makefile
View File

@ -1,37 +1,38 @@
# $FreeBSD$
PORTNAME= supertux
PORTVERSION= 0.4.0
PORTREVISION= 17
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.0
DISTVERSIONSUFFIX= -Source
CATEGORIES= games
MASTER_SITES= https://github.com/SuperTux/supertux/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX= 2
DISTNAME= SuperTux-${DISTVERSIONFULL}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= makc@FreeBSD.org
COMMENT= Side-scroller game similar to Super Mario Brothers
BUILD_DEPENDS= ${LOCALBASE}/include/boost/smart_ptr.hpp:devel/boost-libs
LIB_DEPENDS= libphysfs.so:devel/physfs \
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libfreetype.so:print/freetype2 \
libogg.so:audio/libogg \
libphysfs.so:devel/physfs \
libpng16.so:graphics/png \
libcurl.so:ftp/curl \
libvorbis.so:audio/libvorbis
LLD_UNSAFE= yes
USE_SDL= sdl2 image2
USE_GL= glew
USES= cmake compiler:c++11-lib dos2unix iconv \
openal:al pkgconfig tar:bzip2
# Unhide std::to_string() to fix build with GCC (see ports/193528 for details)
CFLAGS+= -D_GLIBCXX_USE_C99
USES= cmake:noninja compiler:c++14-lang dos2unix gl iconv \
openal:al pkgconfig sdl
USE_GL= gl glew glu
USE_SDL= sdl2 image2 ttf2
CMAKE_ARGS= -DINSTALL_SUBDIR_BIN=bin \
-DBUILD_SHARED_LIBS=off
LLD_UNSAFE= yes
DOS2UNIX_FILES= external/squirrel/CMakeLists.txt \
external/squirrel/squirrel/sqvm.cpp
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
OPTIONS_DEFINE= DOCS
post-patch:
${REINPLACE_CMD} -e '/^Icon=/s,supertux.png,supertux2,' \
${WRKSRC}/supertux2.desktop
.include <bsd.port.mk>

5
games/supertux2/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (supertux-0.4.0.tar.bz2) = d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782
SIZE (supertux-0.4.0.tar.bz2) = 79713147
TIMESTAMP = 1546855404
SHA256 (SuperTux-v0.6.0-Source.tar.gz) = c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0
SIZE (SuperTux-v0.6.0-Source.tar.gz) = 131203604

16
games/supertux2/files/patch-CMakeLists.txt
View File

@ -1,12 +1,12 @@
--- CMakeLists.txt.orig 2015-12-20 14:50:39 UTC
--- CMakeLists.txt.orig 2018-12-23 19:11:31 UTC
+++ CMakeLists.txt
@@ -572,7 +572,8 @@ ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Darwi
@@ -880,7 +880,8 @@ else(WIN32 AND NOT UNIX)
SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/")
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/" RENAME supertux2.png)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/" RENAME supertux2.xpm)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/" RENAME supertux2.png)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/" RENAME supertux2.xpm)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/supertux2.svg DESTINATION "share/icons/hicolor/scalable/apps")
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
ENDIF(WIN32 AND NOT UNIX)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)

11
games/supertux2/files/patch-external_squirrel_CMakeLists.txt
View File

@ -1,11 +0,0 @@
--- external/squirrel/CMakeLists.txt.orig 2015-12-20 14:56:35 UTC
+++ external/squirrel/CMakeLists.txt
@@ -82,8 +82,3 @@ GENERATE_EXPORT_HEADER( squirrel
set(LIB_SUBDIR "lib${LIB_SUFFIX}"
CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)")
-INSTALL(TARGETS squirrel
- RUNTIME DESTINATION bin
- ARCHIVE DESTINATION ${LIB_SUBDIR}
- LIBRARY DESTINATION ${LIB_SUBDIR}
- COMPONENT squirrel)

6
games/supertux2/files/patch-external_squirrel_squirrel_sqvm.cpp
View File

@ -10,11 +10,11 @@ In file included from /usr/include/c++/v1/math.h:310:
#define type(obj) ((obj)._type)
--- external/squirrel/squirrel/sqvm.cpp.orig 2018-03-20 18:48:11.028369000 +0000
+++ external/squirrel/squirrel/sqvm.cpp 2018-03-20 18:48:32.059836000 +0000
--- external/squirrel/squirrel/sqvm.cpp.orig 2019-05-03 09:52:24 UTC
+++ external/squirrel/squirrel/sqvm.cpp
@@ -1,8 +1,8 @@
/*
see copyright notice in squirrel.h
see copyright notice in squirrel.h
*/
-#include "sqpcheader.h"
#include <math.h>

16
games/supertux2/files/patch-external_tinygettext_CMakeLists.txt
View File

@ -1,16 +0,0 @@
--- external/tinygettext/CMakeLists.txt.orig 2015-12-20 14:56:35 UTC
+++ external/tinygettext/CMakeLists.txt
@@ -203,13 +203,5 @@ set(LIB_SUBDIR "lib${LIB_SUFFIX}"
## prepare tinygettext.pc
configure_file(tinygettext.pc.in tinygettext.pc @ONLY)
-install(TARGETS tinygettext
- RUNTIME DESTINATION bin
- ARCHIVE DESTINATION ${LIB_SUBDIR}
- LIBRARY DESTINATION ${LIB_SUBDIR})
-install(FILES ${TINYGETTEXT_HEADERS}
- DESTINATION include/tinygettext)
-install(FILES ${tinygettext_BINARY_DIR}/tinygettext.pc
- DESTINATION ${LIB_SUBDIR}/pkgconfig)
# EOF #

2
games/supertux2/pkg-descr
View File

@ -1,4 +1,4 @@
SuperTux is a 2D jump and run side-scroller game in a style similar
to the original Super Mario games.
WWW: http://supertuxproject.org/
WWW: https://supertuxproject.org/

531
games/supertux2/pkg-plist
View File

File diff suppressed because it is too large Load Diff

1
graphics/aseprite/Makefile
View File

@ -15,7 +15,6 @@ LICENSE_NAME= END-USER LICENSE AGREEMENT FOR ASEPRITE
LICENSE_FILE= ${WRKSRC}/EULA.txt
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
BROKEN_aarch64= fails to compile: undefined reference to __va_copy
BROKEN_armv6= fails to compile: undefined reference to __va_copy
BROKEN_armv7= fails to compile: undefined reference to __va_copy
BROKEN_sparc64= fails to compile: vsnprintf is not a member of std

18
graphics/exact-image/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= exact-image
PORTVERSION= 0.9.1
PORTREVISION= 2
PORTVERSION= 0.9.2
CATEGORIES= graphics perl5 python
MASTER_SITES= https://dl.exactcode.de/oss/exact-image/
@ -14,7 +13,6 @@ LICENSE= GPLv2
BROKEN_armv6= fails to configure: C++ compiler is not installed or does not work correctly
BROKEN_armv7= fails to configure: C++ compiler is not installed or does not work correctly
BROKEN_i386= call to 'abs' is ambiguous
BUILD_DEPENDS= swig3.0:devel/swig30
LIB_DEPENDS= libagg.so:graphics/agg \
@ -31,7 +29,7 @@ LIB_DEPENDS= libagg.so:graphics/agg \
#broken headers on c++ in base system:
CPPFLAGS+= -fpermissive -I${LOCALBASE}/include
USES= gmake jpeg perl5 pkgconfig python:2.7 tar:bzip2
USE_CXXSTD= c++98
USE_CXXSTD= c++03
USE_XORG= x11
HAS_CONFIGURE= yes
INSTALL_WRKSRC= ${WRKSRC}/objdir
@ -43,12 +41,8 @@ PLIST_FILES= ${BINS:S|^|bin/|} \
%%PYTHON_SITELIBDIR%%/_ExactImage.so
BINARY_ALIAS= swig=swig3.0
post-extract:
@${RM} -r ${WRKSRC}/agg-2.4/
post-patch:
@${REINPLACE_CMD} -e '1s|/.*|/bin/sh|;s|/usr/local|${LOCALBASE}|;\
s|libungif|giflib|; s|LIBUNGIF|GIFLIB|; \
/parse_options/d;s| cc | ${CC} |;s| c++ | ${CXX} |;\
s|python -V|${PYTHON_CMD} -V|;\
/PYTHONINCS/s|=.*$$|=-I${PYTHON_INCLUDEDIR}|; \
@ -58,18 +52,16 @@ post-patch:
@${REINPLACE_CMD} -e '/^Q =/d;s|$$[(]COMPILE.cc[)]|${CXX} $${CPPFLAGS} -c|;\
s|$$[(]CXX[)]|${CXX}|;s|$$[(]COMPILE.c[)]|${CC} $${CPPFLAGS} -c|'\
${WRKSRC}/build/bottom.make
@${REINPLACE_CMD} -e '/^CFLAGS =/d;/^CXXFLAGS =/d;/march=/d;\
/mtune=/d;/call cc-option/d;' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|-lungif|-lgif|; s|LIBUNGIF|GIFLIB|' \
${WRKSRC}/codecs/Makefile
@${REINPLACE_CMD} -e '/CFLAGS=/s|".*"|"${CFLAGS} -I${LOCALBASE}/include"|;\
/LIBS=/s|".*"|"-L${LOCALBASE}/lib -lX11"|' ${WRKSRC}/config/pkgcheck-x11.c
@${REINPLACE_CMD} -e 's|$$prg|$$prg ${CPPFLAGS} -I${LOCALBASE}/include|;\
s|/usr/local|${PREFIX}|;/^var_remove/,/^}/d;/^parse_options/,/^}/d; \
s| ++errors | errors+=1 |g' \
${WRKSRC}/config/functions
@${REINPLACE_CMD} -e 's|/usr/X11|${LOCALBASE}|' ${WRKSRC}/lib/vectorial.cc \
@${REINPLACE_CMD} -e 's|/usr/X11|${LOCALBASE}|' \
${WRKSRC}/image/vectorial.cc \
${WRKSRC}/edisplay/edisplay.cc
@${REINPLACE_CMD} -e 's| = {}||g' ${WRKSRC}/image/Colorspace.cc
do-install:
@cd ${INSTALL_WRKSRC}/&&for i in ${BINS};do\

5
graphics/exact-image/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (exact-image-0.9.1.tar.bz2) = 79e6a58522897f9740aa3b5a337f63ad1e0361a772141b24aaff2e31264ece7d
SIZE (exact-image-0.9.1.tar.bz2) = 299565
TIMESTAMP = 1480938306
SHA256 (exact-image-0.9.2.tar.bz2) = 665b205740b17b4162fae73aa36eb7046f28bb216d612461ca0499ff47a566ba
SIZE (exact-image-0.9.2.tar.bz2) = 312995

32
graphics/exact-image/files/patch-Makefile Normal file
View File

@ -0,0 +1,32 @@
--- Makefile.orig 2016-06-18 19:35:35 UTC
+++ Makefile
@@ -7,10 +7,10 @@ include utility/Makefile
X_BUILD_IMPLICIT=1
# -s silcently corrupts binaries on OS X, sigh -ReneR
-CFLAGS := -Wall -O2 # -O1 -ggdb # -fsanitize=address -fsanitize=undefined
+CFLAGS += -Wall # -O2 -O1 -ggdb # -fsanitize=address -fsanitize=undefined
# for config.h
-CPPFLAGS += -I .
+CPPFLAGS += -I . -D__LONG_LONG_SUPPORTED
# -frename-registers and -funroll-loops brings a lot performance on
# my AMD Turion - about 20% time decrease (though it is included in -funroll-loops anyway) !!!
@@ -28,6 +28,7 @@ endif
# TODO: improve to match i[3456]86
ifneq "$(X_ARCH)" "i686"
CFLAGS += -fPIC
+CXXFLAGS += -fPIC
endif
ifeq "$(X_ARCH)" "sparc64"
@@ -48,7 +49,7 @@ CFLAGS += $(call cc-option,-ftree-vectorize,)
# we have some unimplemented colorspaces in the Image::iterator :-(
CFLAGS += $(call cc-option,-Wno-switch -Wno-switch-enum,)
-CXXFLAGS := $(CFLAGS) -Wno-sign-compare
+CXXFLAGS += -Wall -Wno-sign-compare
ifeq "$(STATIC)" "1"
X_EXEFLAGS += -static

11
graphics/exact-image/files/patch-bardecode__code128.hh
View File

@ -1,11 +0,0 @@
--- bardecode/code128.hh.orig 2010-01-16 23:58:07.000000000 -0500
+++ bardecode/code128.hh 2010-01-16 23:38:25.000000000 -0500
@@ -235,7 +235,7 @@
switch (code_set) {
case code_set_c:
if (c < 100) {
- char str[2];
+ char str[3];
sprintf(str,"%02d",c);
return std::string(str);
} else {

26
graphics/exact-image/files/patch-codecs__bmp.cc
View File

@ -1,26 +0,0 @@
--- codecs/bmp.cc.orig 2009-04-27 13:54:29.000000000 -0400
+++ codecs/bmp.cc 2010-01-17 00:32:01.000000000 -0500
@@ -441,6 +441,8 @@
uint8_t* row_data = (uint8_t*) malloc (file_stride);
if (!data || !row_data) {
std::cerr << "Can't allocate space for image buffer\n";
+ free(data);
+ free(row_data);
goto bad1;
}
@@ -522,6 +524,7 @@
comprbuf = (uint8_t *) malloc( compr_size );
if (!comprbuf) {
std::cerr << "Can't allocate space for compressed scanline buffer\n";
+ free(comprbuf);
goto bad1;
}
uncomprbuf = (uint8_t *) malloc( uncompr_size );
@@ -593,6 +596,7 @@
data = (uint8_t *) malloc( uncompr_size );
if (!data) {
std::cerr << "Can't allocate space for final uncompressed scanline buffer\n";
+ free(data);
goto bad1;
}

84
graphics/exact-image/files/patch-codecs__gif.cc
View File

@ -1,4 +1,4 @@
--- codecs/gif.cc.orig 2010-03-03 21:04:44 UTC
--- codecs/gif.cc.orig 2015-03-28 15:35:58 UTC
+++ codecs/gif.cc
@@ -22,6 +22,24 @@
@ -25,26 +25,26 @@
/* The way Interlaced image should. */
static const int InterlacedOffset[] = { 0, 4, 2, 1 };
@@ -60,9 +78,13 @@ int GIFCodec::readImage (std::istream* s
ColorMapObject *ColorMap = NULL;
int ExtCode;
@@ -60,9 +78,13 @@ int GIFCodec::readImage (std::istream* stream, Image&
ColorMapObject *ColorMap = 0;
int GifError, ExtCode;
+#if GIFLIB_MAJOR >= 5
+ if ((GifFile = DGifOpen (stream, &GIFInputFunc, NULL)) == NULL)
if ((GifFile = DGifOpen (stream, &GIFInputFunc, &GifError)) == 0)
+#else
if ((GifFile = DGifOpen (stream, &GIFInputFunc)) == NULL)
+ if ((GifFile = DGifOpen (stream, &GIFInputFunc)) == 0)
+#endif
{
- PrintGifError();
- //PrintGifError();
+ std::cerr << "\nGIF-LIB error: can't open GIF file" << std::endl;
return false;
}
@@ -74,7 +96,11 @@ int GIFCodec::readImage (std::istream* s
@@ -74,7 +96,11 @@ int GIFCodec::readImage (std::istream* stream, Image&
/* Scan the content of the GIF file and load the image(s) in: */
do {
if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
- PrintGifError();
- //PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ ExactImagePrintGifError(GifFile->Error);
+#else
@ -53,11 +53,11 @@
return false;
}
@@ -83,7 +109,11 @@ int GIFCodec::readImage (std::istream* s
@@ -83,7 +109,11 @@ int GIFCodec::readImage (std::istream* stream, Image&
switch (RecordType) {
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
- PrintGifError();
- //PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ ExactImagePrintGifError(GifFile->Error);
+#else
@ -66,11 +66,11 @@
return false;
}
@@ -104,7 +134,11 @@ int GIFCodec::readImage (std::istream* s
@@ -104,7 +134,11 @@ int GIFCodec::readImage (std::istream* stream, Image&
j += InterlacedJumps[i]) {
if (DGifGetLine(GifFile, &image.getRawData()[j*image.stride()+Col],
Width) == GIF_ERROR) {
- PrintGifError();
- //PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ ExactImagePrintGifError(GifFile->Error);
+#else
@ -79,11 +79,11 @@
return false;
}
}
@@ -113,7 +147,11 @@ int GIFCodec::readImage (std::istream* s
@@ -113,7 +147,11 @@ int GIFCodec::readImage (std::istream* stream, Image&
for (int i = 0; i < Height; ++i) {
if (DGifGetLine(GifFile, &image.getRawData()[Row++ * image.stride()+Col],
Width) == GIF_ERROR) {
- PrintGifError();
- //PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ ExactImagePrintGifError(GifFile->Error);
+#else
@ -92,11 +92,11 @@
return false;
}
}
@@ -122,12 +160,20 @@ int GIFCodec::readImage (std::istream* s
@@ -122,12 +160,20 @@ int GIFCodec::readImage (std::istream* stream, Image&
case EXTENSION_RECORD_TYPE:
/* Skip any extension blocks in file: */
if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
- PrintGifError();
- //PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ ExactImagePrintGifError(GifFile->Error);
+#else
@ -104,9 +104,9 @@
+#endif
return false;
}
while (Extension != NULL) {
while (Extension != 0) {
if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
- PrintGifError();
- //PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ ExactImagePrintGifError(GifFile->Error);
+#else
@ -115,74 +115,62 @@
return false;
}
}
@@ -155,7 +201,11 @@ int GIFCodec::readImage (std::istream* s
@@ -155,7 +201,11 @@ int GIFCodec::readImage (std::istream* stream, Image&
// convert colormap to our 16bit "TIFF"format
colorspace_de_palette (image, ColorMap->ColorCount, rmap, gmap, bmap);
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+ EGifCloseFile(GifFile, NULL);
EGifCloseFile(GifFile, &GifError);
+#else
EGifCloseFile(GifFile);
+ EGifCloseFile(GifFile);
+#endif
return true;
}
@@ -166,7 +216,11 @@ bool GIFCodec::writeImage (std::ostream*
GifFileType* GifFile;
@@ -167,7 +217,11 @@ bool GIFCodec::writeImage (std::ostream* stream, Image
GifByteType* Ptr;
int GifError;
+#if GIFLIB_MAJOR >= 5
+ if ((GifFile = EGifOpen (stream, &GIFOutputFunc, NULL)) == NULL)
if ((GifFile = EGifOpen(stream, &GIFOutputFunc, &GifError)) == 0)
+#else
if ((GifFile = EGifOpen (stream, &GIFOutputFunc)) == NULL)
+ if ((GifFile = EGifOpen(stream, &GIFOutputFunc)) == 0)
+#endif
{
std::cerr << "Error preparing GIF file for writing." << std::endl;
return false;
@@ -175,7 +229,11 @@ bool GIFCodec::writeImage (std::ostream*
@@ -176,7 +230,11 @@ bool GIFCodec::writeImage (std::ostream* stream, Image
int ColorMapSize = 256;
// later use our own colormap generation
+#if GIFLIB_MAJOR >= 5
+ ColorMapObject* OutputColorMap = GifMakeMapObject(ColorMapSize, NULL);
ColorMapObject* OutputColorMap = GifMakeMapObject(ColorMapSize, 0);
+#else
ColorMapObject* OutputColorMap = MakeMapObject(ColorMapSize, NULL);
+ ColorMapObject* OutputColorMap = MakeMapObject(ColorMapSize, 0);
+#endif
if (!OutputColorMap)
return false;
@@ -203,7 +261,11 @@ bool GIFCodec::writeImage (std::ostream*
@@ -204,7 +262,11 @@ bool GIFCodec::writeImage (std::ostream* stream, Image
}
+#if GIFLIB_MAJOR >= 5
+ if (GifQuantizeBuffer(image.w, image.h, &ColorMapSize,
if (GifQuantizeBuffer(image.w, image.h, &ColorMapSize,
+#else
if (QuantizeBuffer(image.w, image.h, &ColorMapSize,
+ if (QuantizeBuffer(image.w, image.h, &ColorMapSize,
+#endif
RedBuffer, GreenBuffer, BlueBuffer,
OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) {
return false;
@@ -215,7 +277,7 @@ bool GIFCodec::writeImage (std::ostream*
if (EGifPutScreenDesc(GifFile, image.w, image.h,
ColorMapSize, 0, OutputColorMap) == GIF_ERROR ||
EGifPutImageDesc(GifFile, 0, 0, image.w, image.h,
- FALSE, NULL) == GIF_ERROR)
+ false, NULL) == GIF_ERROR)
{
std::cerr << "Error writing GIF header." << std::endl;
return false;
@@ -232,9 +294,13 @@ bool GIFCodec::writeImage (std::ostream*
}
free (OutputBuffer);
@@ -235,7 +297,11 @@ bool GIFCodec::writeImage (std::ostream* stream, Image
- delete (RedBuffer); delete (GreenBuffer); delete (BlueBuffer);
+ delete[] RedBuffer; delete[] GreenBuffer; delete[] BlueBuffer;
delete[] RedBuffer; delete[] GreenBuffer; delete[] BlueBuffer;
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+ EGifCloseFile(GifFile, NULL);
EGifCloseFile(GifFile, &GifError);
+#else
EGifCloseFile(GifFile);
+ EGifCloseFile(GifFile);
+#endif
return true;
}

19
graphics/exact-image/files/patch-codecs__xpm.cc
View File

@ -1,19 +0,0 @@
--- codecs/xpm.cc.orig 2009-07-02 18:34:51.000000000 -0400
+++ codecs/xpm.cc 2009-07-02 18:48:45.000000000 -0400
@@ -131,6 +131,7 @@
// Type: c -> colour, m -> monochrome, g -> grayscale, and s -> symbolic
if (type != "c") {
std::cerr << "XPM color type: " << type << " not yet implemented." << std::endl;
+ delete[] rmap; delete[] gmap; delete[] bmap;
return false;
}
@@ -197,7 +198,7 @@
}
colorspace_de_palette (image, colors, rmap, gmap, bmap);
- delete (rmap); delete (gmap); delete (bmap);
+ delete[] rmap; delete[] gmap; delete[] bmap;
rmap = gmap = bmap = 0;
return true;

60
graphics/exact-image/files/patch-codecs_dcraw.h
View File

@ -1,16 +1,6 @@
--- codecs/dcraw.h.orig 2013-10-22 14:00:07 UTC
--- codecs/dcraw.h.orig 2015-07-16 15:20:12 UTC
+++ codecs/dcraw.h
@@ -775,7 +775,8 @@ struct jhead {
int CLASS ljpeg_start (struct jhead *jh, int info_only)
{
- int c, tag, len;
+ int c,tag;
+ ushort len;
uchar data[0x10000];
const uchar *dp;
@@ -786,8 +787,9 @@ int CLASS ljpeg_start (struct jhead *jh,
@@ -843,8 +843,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only
do {
fread (data, 2, 2, ifp);
tag = data[0] << 8 | data[1];
@ -22,3 +12,49 @@
fread (data, 1, len, ifp);
switch (tag) {
case 0xffc3:
@@ -4393,22 +4394,22 @@ void CLASS vng_interpolate()
-2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
-2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
-2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
+ -1,-2,-1,+0,0,-128, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
+ -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,-120, -1,-1,+1,-2,0,0x40,
-1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
-1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
-1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
-1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
-1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
-1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
+ +0,-2,+0,+0,1,-128, +0,-1,+0,+1,1,-120, +0,-1,+1,-2,0,0x40,
+0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
+0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
+0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
+0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
+0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+ +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,-128,
+ +1,-1,+1,+1,0,-120, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+1,+0,+2,+1,0,0x10
}, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
ushort (*brow[5])[4], *pix;
@@ -7771,7 +7772,7 @@ void CLASS adobe_coeff (const char *make, const char *
{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
{ "Phase One P65", 0, 0,
{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
- { "Red One", 704, 0xffff, /* DJC */
+ { "Red One", 704, -1, /* DJC */
{ 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } },
{ "Samsung EX1", 0, 0x3e00,
{ 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } },
@@ -9547,7 +9548,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
strncpy (th->desc, desc, 512);
strncpy (th->make, make, 64);
strncpy (th->model, model, 64);
- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
+ strcpy (th->soft, "dcraw v" DCRAW_VERSION);
t = localtime (&timestamp);
sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);

11
graphics/exact-image/files/patch-frontends-bardecode.cc
View File

@ -1,11 +0,0 @@
--- frontends/bardecode.cc.orig 2010-06-18 18:02:15.000000000 +0400
+++ frontends/bardecode.cc 2014-01-13 07:31:33.549465639 +0400
@@ -145,7 +145,7 @@
}
}
- for (std::map<scanner_result_t,int>::const_iterator it = codes.begin();
+ for (std::map<scanner_result_t,int,comp>::const_iterator it = codes.begin();
it != codes.end();
++it) {
if (it->first.type&(ean|code128|gs1_128) || it->second > 1)

10
graphics/exact-image/files/patch-lib__ContourMatching.cc
View File

@ -1,10 +0,0 @@
--- lib/ContourMatching.cc.orig 2009-07-10 11:19:11.000000000 -0400
+++ lib/ContourMatching.cc 2009-07-10 11:20:05.000000000 -0400
@@ -1,6 +1,7 @@
#include <cmath>
#include <algorithm>
#include <iostream>
+#include <stdio.h>
#include "ContourMatching.hh"

13
graphics/exact-image/files/patch-lib__ContourUtility.cc
View File

@ -1,13 +0,0 @@
--- lib/ContourUtility.cc.orig 2009-07-10 10:25:43.000000000 -0400
+++ lib/ContourUtility.cc 2009-07-10 10:26:31.000000000 -0400
@@ -1,9 +1,9 @@
-#include "ContourUtility.hh"
#include <cmath>
#include <cstdlib>
//#include <iostream>
#include <assert.h>
#include <stdio.h>
+#include "ContourUtility.hh"
void CenterAndReduce(const Contours::Contour& source,
Contours::Contour& dest,

24
graphics/exact-image/files/patch-lib__ImageIterator2.hh
View File

@ -1,24 +0,0 @@
--- lib/ImageIterator2.hh.orig 2011-03-16 13:35:37.000000000 -0400
+++ lib/ImageIterator2.hh 2011-03-16 13:36:39.000000000 -0400
@@ -358,9 +358,9 @@
}
accu& abs() {
- v[0] = std::abs(v[0]);
- v[1] = std::abs(v[1]);
- v[2] = std::abs(v[2]);
+ v[0] = std::labs(v[0]);
+ v[1] = std::labs(v[1]);
+ v[2] = std::labs(v[2]);
return *this;
}
@@ -639,7 +639,7 @@
}
accu& abs() {
- v[0] = std::abs(v[0]);
+ v[0] = std::labs(v[0]);
return *this;
}

69
graphics/exact-image/files/patch-libpng14
View File

@ -1,69 +0,0 @@
--- codecs/png.cc
+++ codecs/png.cc
@@ -71,7 +71,7 @@
/* Allocate/initialize the memory for image information. REQUIRED. */
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) {
- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
return 0;
}
@@ -82,7 +82,7 @@
if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
/* If we get here, we had a problem reading the file */
return 0;
}
@@ -99,7 +99,7 @@
png_read_info (png_ptr, info_ptr);
png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- &interlace_type, int_p_NULL, int_p_NULL);
+ &interlace_type, NULL, NULL);
image.w = width;
image.h = height;
@@ -132,7 +132,7 @@
#if 0 // no longer needed
/* Expand grayscale images to the full 8 bits from 2, or 4 bits/pixel */
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth > 1 && bit_depth < 8) {
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
image.bps = 8;
}
#endif
@@ -196,11 +196,11 @@
for (int pass = 0; pass < number_passes; ++pass)
for (unsigned int y = 0; y < height; ++y) {
row_pointers[0] = image.getRawData() + y * stride;
- png_read_rows(png_ptr, row_pointers, png_bytepp_NULL, 1);
+ png_read_rows(png_ptr, row_pointers, NULL, 1);
}
/* clean up after the read, and free any memory allocated - REQUIRED */
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
/* that's it */
return true;
@@ -224,7 +224,7 @@
/* Allocate/initialize the memory for image information. REQUIRED. */
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) {
- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
+ png_destroy_write_struct(&png_ptr, NULL);
return false;
}
@@ -244,7 +244,6 @@
else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION;
png_set_compression_level(png_ptr, quality);
- png_info_init (info_ptr);
/* Set up our STL stream output control */
png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data);

34
graphics/exact-image/files/patch-libpng15
View File

@ -1,34 +0,0 @@
--- codecs/png.cc
+++ codecs/png.cc
@@ -16,6 +16,7 @@
*/
#include <stdlib.h>
+#include <zlib.h>
#include <png.h>
#include <iostream>
@@ -104,7 +105,7 @@
image.w = width;
image.h = height;
image.bps = bit_depth;
- image.spp = info_ptr->channels;
+ image.spp = png_get_channels(png_ptr, info_ptr);
png_uint_32 res_x, res_y;
res_x = png_get_x_pixels_per_meter(png_ptr, info_ptr);
@@ -120,10 +121,13 @@
// png_set_packswap(png_ptr);
/* Expand paletted colors into true RGB triplets */
+
+ int num_trans;
+
if (color_type == PNG_COLOR_TYPE_PALETTE) {
png_set_palette_to_rgb(png_ptr);
image.bps = 8;
- if (info_ptr->num_trans)
+ if (num_trans)
image.spp = 4;
else
image.spp = 3;

2
irc/ircd-ratbox-devel/Makefile
View File

@ -16,8 +16,6 @@ LICENSE= GPLv2
CONFLICTS= ircd-ratbox-[0-9]* charybdis-[0-9]*
BROKEN_aarch64= Fails to link: missing sbrk
USES= libtool perl5 sqlite tar:bzip2
USE_RC_SUBR= ircd-ratbox
USE_PERL5= build

2
irc/ircd-ratbox/Makefile
View File

@ -15,8 +15,6 @@ LICENSE= GPLv2
CONFLICTS= ircd-ratbox-devel-[0-9]* charybdis-[0-9]*
BROKEN_aarch64= Fails to link: missing sbrk
USES= cpe libtool sqlite tar:bzip2
CPE_VENDOR= ratbox
USE_RC_SUBR= ircd-ratbox

2
japanese/kterm/Makefile
View File

@ -17,8 +17,6 @@ LICENSE= MIT
BUILD_DEPENDS= nkf:japanese/nkf
BROKEN_aarch64= Fails to build: fatal error: kfontlist.c file not found
USES= imake
USE_XORG= ice sm x11 xaw xext xmu xpm xt
USE_GITHUB= yes

2
lang/gcc8-devel/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gcc
PORTVERSION= 8.3.1.s20190419
PORTVERSION= 8.3.1.s20190426
CATEGORIES= lang
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel

6
lang/gcc8-devel/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1555993350
SHA256 (gcc-8-20190419.tar.xz) = 7018a9cb026c2b891bf605d6f6694e073d233bf0dc1118e0629df87d351c30f1
SIZE (gcc-8-20190419.tar.xz) = 61856424
TIMESTAMP = 1556745588
SHA256 (gcc-8-20190426.tar.xz) = 342295ab7baab1f7ad7110d1c3c00f29491d79c95aaed6c16f6e959024273fdf
SIZE (gcc-8-20190426.tar.xz) = 61860168

5
lang/gravity/Makefile
View File

@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= gravity
DISTVERSION= 0.7.0
DISTVERSION= 0.7.0-2
DISTVERSIONSUFFIX= -g916d558
CATEGORIES= lang
PKGNAMESUFFIX= -lang
@ -15,8 +16,6 @@ USES= cmake
USE_GITHUB= yes
GH_ACCOUNT= marcobambini
LDFLAGS+= -lm
PLIST_FILES= bin/${PORTNAME}
.include <bsd.port.mk>

6
lang/gravity/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1556854092
SHA256 (marcobambini-gravity-0.7.0_GH0.tar.gz) = f4d4d4d6c88787cb0dcb678792ef4ef932b1e63324f8ae7885cebecf24872815
SIZE (marcobambini-gravity-0.7.0_GH0.tar.gz) = 862110
TIMESTAMP = 1556918049
SHA256 (marcobambini-gravity-0.7.0-2-g916d558_GH0.tar.gz) = efb3187eecea08315db506361243d76d93fb080bf1b2b4e836b075ce3aed86de
SIZE (marcobambini-gravity-0.7.0-2-g916d558_GH0.tar.gz) = 863799

5
lang/php73/Makefile
View File

@ -2,9 +2,9 @@
PORTNAME= php73
DISTVERSION= 7.3.4
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
MASTER_SITES= PHP/distributions
DISTNAME= php-${DISTVERSION}
MAINTAINER= tz@FreeBSD.org
@ -29,6 +29,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
--with-pcre-regex=${LOCALBASE} \
--with-password-argon2=${LOCALBASE} \
--program-prefix=""
CONFIGURE_ENV= CPPFLAGS="-I/usr/local/include"
USES+= autoreconf:build
USE_GNOME= libxml2

2
lang/rust-nightly/Makefile
View File

@ -14,7 +14,7 @@ CONFLICTS_INSTALL= rust
# Which source to pull:
# https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
# https://static.rust-lang.org/dist/channel-rust-nightly.toml
NIGHTLY_DATE= 2019-05-02
NIGHTLY_DATE= 2019-05-04
NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/
# See WRKSRC/src/stage0.txt for this date

6
lang/rust-nightly/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1556737322
SHA256 (rust/2019-05-02/rustc-nightly-src.tar.xz) = 244f38216015d0e367dd1084d524d23cec06bb50b8d303380312f6cfd3e39173
SIZE (rust/2019-05-02/rustc-nightly-src.tar.xz) = 98459272
TIMESTAMP = 1556918114
SHA256 (rust/2019-05-04/rustc-nightly-src.tar.xz) = d0eccd7d48264dee38f43ef0c21eb71030f92ca5762c0e4ec2d5529820e196ed
SIZE (rust/2019-05-04/rustc-nightly-src.tar.xz) = 98464580
SHA256 (rust/2019-04-11/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 711f4537f4f92dd1a42035411d8e002cdd5d30f4e29e702014656cc79ddc0f0c
SIZE (rust/2019-04-11/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 73817509
SHA256 (rust/2019-04-11/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 005f878c85250a1c0cb8c3ba43c42bfc509177c5c61bbe81f62d35c99f1478d3

1
lang/see/Makefile
View File

@ -20,7 +20,6 @@ LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING
LICENSE_FILE_DTOA.C= ${WRKSRC}/COPYING
LICENSE_PERMS_DTOA.C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BROKEN_aarch64= fails to configure: floating point not detected: Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined
BROKEN_armv6= fails to configure: floating point not detected: Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined
BROKEN_armv7= fails to configure: floating point not detected: Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined

2
lang/squeak/Makefile
View File

@ -21,7 +21,7 @@ COMMENT= Full Smalltalk 80 with portability to Unix, Mac, and Windows
LICENSE= APACHE20 MIT
LICENSE_COMB= multi
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpcspe
ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc powerpc64 powerpcspe
BUILD_DEPENDS= cmake:devel/cmake \
v4l_compat>=1.0.20120501:multimedia/v4l_compat

11
lang/tcl87/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= tcl
DISTVERSION= 8.7a1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${DISTVERSION} \
TCLTK/tcl8_7
@ -18,6 +18,8 @@ LICENSE_NAME= Tcl/Tk License
LICENSE_FILE= ${WRKSRC}/../license.terms
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
EXTRACT_AFTER_ARGS= --exclude compat
OPTIONS_DEFINE= TCLMAN TZDATA DEBUG
OPTIONS_DEFAULT=TCLMAN TZDATA
OPTIONS_DEFINE_amd64= DTRACE
@ -36,7 +38,6 @@ PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION}
WRKSRC= ${PATCH_WRKSRC}/unix
ALL_TARGET= binaries libraries doc
INSTALL_TARGET= install-strip
TEST_TARGET= test-tcl
USE_LDCONFIG= yes
@ -62,6 +63,12 @@ DTRACE_CONFIGURE_ENABLE= dtrace
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEBUG}
INSTALL_TARGET+=install
.else
INSTALL_TARGET+=install-strip
.endif
.if ${PORT_OPTIONS:MDTRACE}
PLIST_SUB+= DTRACE=""
.else

4
mail/dbmail/Makefile
View File

@ -21,8 +21,6 @@ BUILD_DEPENDS= asciidoc:textproc/asciidoc \
xmlto:textproc/xmlto \
docbook-sgml>0:textproc/docbook-sgml
BROKEN_aarch64= Fails to link: missing sbrk
CONFLICTS= dbmail22-[0-9]*
OPTIONS_DEFINE= DOCS LDAP SIEVE
@ -32,9 +30,9 @@ SIEVE_DESC= Sieve mail sorting language support
OPTIONS_SUB= yes
INSTALL_TARGET= install-strip
USES= autoreconf gmake libtool pkgconfig shebangfix ssl tar:bzip2
USE_LDCONFIG= ${PREFIX}/lib/dbmail
USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
USES= autoreconf gmake libtool pkgconfig shebangfix ssl tar:bzip2
GNU_CONFIGURE= yes
SHEBANG_FILES= man/fixsp.pl

4
mail/wanderlust/Makefile
View File

@ -21,10 +21,10 @@ RUN_DEPENDS= emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
USES= emacs
USE_GITHUB= yes
GH_TAGNAME= ebde9a4
GH_TAGNAME= 6528a00
NO_ARCH= yes
SNAPDATE= 20180826
SNAPDATE= 20190406
MAKE_ARGS+= EMACS=${EMACS_CMD} \
FLAGS="-batch -q -no-site-file" \

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