Merge pull request #8564 from Biswa96/fix-packages

Fix packages
This commit is contained in:
Christoph Reiter
2021-05-04 21:31:42 +02:00
committed by GitHub
12 changed files with 180 additions and 134 deletions

View File

@@ -3,7 +3,7 @@
_realname=librsync
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.3.1
pkgver=2.3.2
pkgrel=1
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -17,7 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
license=('LGPL2')
options=('strip' 'staticlibs' 'docs')
source=(${_realname}-${pkgver}.tar.gz::"https://github.com/librsync/librsync/archive/v${pkgver}.tar.gz")
sha256sums=('dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569')
sha256sums=('ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f')
build() {
declare -a extra_config

View File

@@ -4,20 +4,16 @@ _realname=libsigc++
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.10.6
pkgrel=2
pkgrel=3
pkgdesc="Libsigc++ implements a full callback system for use in widget libraries - V2 (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
url="https://libsigcplusplus.github.io/libsigcplusplus/"
license=("LGPL")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-doxygen"
"${MINGW_PACKAGE_PREFIX}-graphviz"
makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-pkg-config")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
options=('staticlibs' 'strip')
options=('strip' '!debug' 'staticlibs')
source=("https://github.com/libsigcplusplus/libsigcplusplus/releases/download/${pkgver}/${_realname}-${pkgver}.tar.xz")
sha256sums=('dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b')
@@ -36,11 +32,16 @@ build() {
--buildtype plain \
--wrap-mode=nofallback \
-Dauto_features=enabled \
-Dbuild-documentation=true \
-Dbuild-documentation=false \
--default-library both \
"../${_realname}-${pkgver}"
${MINGW_PREFIX}/bin/ninja.exe
${MINGW_PREFIX}/bin/meson.exe compile
}
check() {
cd "${srcdir}/build-${MINGW_CHOST}"
${MINGW_PREFIX}/bin/meson.exe test || true
}
package() {

View File

@@ -1,52 +0,0 @@
From a25a9e1fab97d977aaa41d4530a956d5642f477b Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 17 Feb 2021 17:07:43 +0100
Subject: [PATCH 7/7] mingw fix setsockopt optval arg via cast
---
groupsock/GroupsockHelper.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/groupsock/GroupsockHelper.cpp b/groupsock/GroupsockHelper.cpp
index 90a66d3..658bb67 100644
--- a/groupsock/GroupsockHelper.cpp
+++ b/groupsock/GroupsockHelper.cpp
@@ -180,7 +180,7 @@ int setupDatagramSocket(UsageEnvironment& env, Port port, int domain) {
// For IPv6 sockets, we need the IPV6_V6ONLY flag set to 1, otherwise we would not
// be able to have an IPv4 socket and an IPv6 socket bound to the same port:
int const one = 1;
- (void)setsockopt(newSocket, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof one);
+ (void)setsockopt(newSocket, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char*>(&one), sizeof one);
MAKE_SOCKADDR_IN6(name, port.num());
if (bind(newSocket, (struct sockaddr*)&name, sizeof name) != 0) {
@@ -351,7 +351,7 @@ int setupStreamSocket(UsageEnvironment& env, Port port, int domain,
// For IPv6 sockets, we need the IPV6_V6ONLY flag set to 1, otherwise we would not
// be able to have an IPv4 socket and an IPv6 socket bound to the same port:
int const one = 1;
- (void)setsockopt(newSocket, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof one);
+ (void)setsockopt(newSocket, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char*>(&one), sizeof one);
MAKE_SOCKADDR_IN6(name, port.num());
if (bind(newSocket, (struct sockaddr*)&name, sizeof name) != 0) {
@@ -597,7 +597,7 @@ Boolean socketJoinGroup(UsageEnvironment& env, int socket,
return False;
}
}
- if (setsockopt(socket, level, option_name, option_value, option_len) < 0) {
+ if (setsockopt(socket, level, option_name, reinterpret_cast<const char*>(option_value), option_len) < 0) {
#if defined(__WIN32__) || defined(_WIN32)
if (env.getErrno() != 0) {
// That piece-of-shit toy operating system (Windows) sometimes lies
@@ -650,7 +650,7 @@ Boolean socketLeaveGroup(UsageEnvironment&, int socket,
return False;
}
}
- if (setsockopt(socket, level, option_name, option_value, option_len) < 0) {
+ if (setsockopt(socket, level, option_name, reinterpret_cast<const char*>(option_value), option_len) < 0) {
return False;
}
--
2.30.1.windows.1

View File

@@ -1,4 +1,3 @@
# $Id$
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Maintainer: Zach Bacon <11doctorwhocanada@gmail.com>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
@@ -7,14 +6,15 @@
_realname=live-media
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2021.02.11
pkgver=2021.04.06
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
license=('LGPL')
url="http://live555.com/liveMedia"
depends=("${MINGW_PACKAGE_PREFIX}-gcc")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-openssl")
makedepends=("rsync")
options=('staticlibs')
source=("https://download.videolan.org/contrib/live555/live.${pkgver}.tar.gz"
@@ -23,16 +23,14 @@ source=("https://download.videolan.org/contrib/live555/live.${pkgver}.tar.gz"
0003-mingw-static-libs.patch
0004-live555-formatmessage.patch
0005-Fix-testProgs-static-lib-link-order.patch
0006-mingw-NO_GETIFADDRS.patch
0007-mingw-fix-setsockopt-optval-arg-via-cast.patch)
sha256sums=('834ad3fc199f1a6b0c09646976deb71a3a7803dc7b498ce92e920f6cb7b717ba'
0006-mingw-NO_GETIFADDRS.patch)
sha256sums=('0bd182fac7d6297d924af4405ce840515a38fa5438cb1a4b90fcb6bc737b36d6'
'8611cb5eb31571d4026a66d47a98f2a08abf3b6c3ac373ee0c28638a3bf3c4dc'
'84e1df79f5a2496068d37211dcd4c4a8c72c779cdf2f9d75d61847c08bb0eb91'
'6111b8119b80eca6a2fdd1c116f2e3509d62098d3c36944bd1bf83bb03342c87'
'58255bbd2e43112e36647d1194aa0cfa98d0e9bf58a8a41d59e1e81e1589028a'
'9fb73d9da3c9448cc47ef14a3978861ed0d442822f48481ae8d858db1b04ae8e'
'1a52a453eff64204d06f7616da19ce8def5798194ed20e93cc470cd0007a35ba'
'e47358cc8e622de847607153a7f2d8e20a774cdf950714199aabbdf40baeb2e3')
'1a52a453eff64204d06f7616da19ce8def5798194ed20e93cc470cd0007a35ba')
prepare() {
cd ${srcdir}/live
@@ -48,7 +46,6 @@ prepare() {
patch -p1 -i ${srcdir}/0004-live555-formatmessage.patch
patch -p1 -i ${srcdir}/0005-Fix-testProgs-static-lib-link-order.patch
patch -p1 -i ${srcdir}/0006-mingw-NO_GETIFADDRS.patch
patch -p1 -i ${srcdir}/0007-mingw-fix-setsockopt-optval-arg-via-cast.patch
}
build() {

View File

@@ -0,0 +1,44 @@
diff --unified -r vlfeat-0.9.21.orig/Makefile vlfeat-0.9.21/Makefile
--- vlfeat-0.9.21.orig/Makefile 2021-05-04 20:20:02.303185600 +0530
+++ vlfeat-0.9.21/Makefile 2021-05-04 20:22:12.785689300 +0530
@@ -239,7 +239,7 @@
# 1) _GNU_SOURCE avoids using isoc99_fscanf, limiting binary portability to recent GLIBC.
# 2) -fno-stack-protector avoids using a feature requiring GLBIC 2.4
STD_CFLAGS += -m$(march) -D_GNU_SOURCE -fno-stack-protector
-STD_LDFLAGS += -m$(march) -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed
+STD_LDFLAGS += -m$(march) -Wl,--as-needed
endif
# Convert back DISALBE_*="no" flags to be empty
diff --unified -r vlfeat-0.9.21.orig/make/bin.mak vlfeat-0.9.21/make/bin.mak
--- vlfeat-0.9.21.orig/make/bin.mak 2021-05-04 20:20:02.271494100 +0530
+++ vlfeat-0.9.21/make/bin.mak 2021-05-04 20:21:39.579864300 +0530
@@ -44,16 +44,6 @@
BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
endif
-# MingW-32
-ifeq ($(ARCH),mingw32)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
-# MingW-64
-ifeq ($(ARCH),mingw64)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
# --------------------------------------------------------------------
# Build
# --------------------------------------------------------------------
diff --unified -r vlfeat-0.9.21.orig/make/dll.mak vlfeat-0.9.21/make/dll.mak
--- vlfeat-0.9.21.orig/make/dll.mak 2021-05-04 20:20:02.271494100 +0530
+++ vlfeat-0.9.21/make/dll.mak 2021-05-04 20:20:35.413815600 +0530
@@ -37,7 +37,7 @@
DLL_CFLAGS = \
$(STD_CFLAGS) \
--fvisibility=hidden -fPIC -DVL_BUILD_DLL \
+-fvisibility=hidden -DVL_BUILD_DLL \
$(LINK_DLL_CFLAGS) \
$(call if-like,%_sse2,$*, $(if $(DISABLE_SSE2),,-msse2)) \
$(call if-like,%_avx,$*, $(if $(DISABLE_AVX),,-mavx)) \

View File

@@ -4,7 +4,7 @@ _realname=vlfeat
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.9.21
pkgrel=2
pkgrel=3
pkgdesc="The VLFeat open source library implements popular computer vision algorithms specializing in image understanding and local features extraction and matching. (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -15,11 +15,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
source=("http://www.vlfeat.org/download/${_realname}-${pkgver}.tar.gz"
"01-vlfeat-0.9.20-1-buildsys.mingw.patch"
"02-Makefile-fix-arch-detection.patch"
"03-fix-openmp-building-with-gcc.patch")
"03-fix-openmp-building-with-gcc.patch"
"04-remove-fpic-rpath-for-clang.patch")
sha256sums=('8cbf686fd008e3d119c3a0986ffd06e4c3d9448b6f4721a9cc9bb4964c82ff55'
'ff1b998d5af23bcd3e0e5f4084d1d29a67e08c0b0a8c2f36829ad435278ffd5f'
'b377ccec0b9934720111b1bed0afc420dd244747df80cd358ed92afc2c5d0d61'
'84151ec314d5b63fee45eb91ac7c9a1181fb4361d41f40fc1707763c1ce5e55a')
'84151ec314d5b63fee45eb91ac7c9a1181fb4361d41f40fc1707763c1ce5e55a'
'afe3ff1fb934d768cf3dc7c5f498b2acc05f80d56194ca5653c1ef1bb3789f0e')
prepare() {
# Replace minizip with external
@@ -29,6 +31,8 @@ prepare() {
# https://github.com/vlfeat/vlfeat/pull/200.patch
patch -p1 -i "${srcdir}/03-fix-openmp-building-with-gcc.patch"
patch -p1 -i "${srcdir}/04-remove-fpic-rpath-for-clang.patch"
}
build() {

View File

@@ -1,5 +1,5 @@
--- xavs-0.1.55/configure 2017-11-01 07:06:44.216163200 -0400
+++ xavs-0.1.55/configure 2017-11-01 07:08:12.358962400 -0400
--- a/configure
+++ b/configure
@@ -155,6 +155,7 @@
host="${host#*-}"
host_vendor="${host%%-*}"
@@ -8,7 +8,15 @@
case $host_os in
beos*)
@@ -404,8 +405,7 @@
@@ -397,15 +398,14 @@
fi
if [ "$pic" = "yes" ] ; then
- CFLAGS="$CFLAGS -fPIC"
+ CFLAGS="$CFLAGS"
ASFLAGS="$ASFLAGS -DPIC"
# resolve textrels in the x86 asm
cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
fi
if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
@@ -18,16 +26,19 @@
fi
if [ "$debug" = "yes" ]; then
--- xavs-0.1.55/Makefile 2017-11-01 07:09:46.732294400 -0400
+++ xavs-0.1.55/Makefile 2017-11-01 07:09:50.859793100 -0400
@@ -69,8 +69,8 @@
--- a/Makefile
+++ b/Makefile
@@ -67,10 +67,10 @@
$(RANLIB) libxavs.a
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SOFLAGS) $(LDFLAGS)
- $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SOFLAGS) $(LDFLAGS)
+ $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
-xavs$(EXE): $(OBJCLI) libxavs.a
- $(CC) -o $@ $+ $(LDFLAGS)
+xavs$(EXE): $(OBJCLI) $(SONAME)
+ $(CC) -o $@ $(OBJCLI) $(LDFLAGS) -L. -lxavs
+xavs$(EXE): $(OBJCLI) $(SONAME) libxavs.a
+ $(CC) -o $@ $(OBJCLI) -L. -lxavs $(LDFLAGS)
xavsvfw.dll: libxavs.a $(wildcard vfw/*.c vfw/*.h)
make -C vfw/build/cygwin

View File

@@ -4,7 +4,7 @@ _realname=xavs
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.1.55
pkgrel=1
pkgrel=2
pkgdesc="XAVS is to implement high quality encoder and decoder of the Audio Video Standard of China (AVS). (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -15,24 +15,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
source=("https://github.com/OpenMandrivaAssociation/xavs/raw/master/xavs-${pkgver}.tar.xz"
"0001-xavs-0.1.55-fix-dynamic-build.patch"
"0002-xavs-0.1.55-fix-asm.patch")
sha256sums=("178bf04ffc5edd9acfa8188acbeeab16e24e4e43f4465729e8619f844e5901f2"
"0a6bdb653db4c63ab1c60ee5fd7303215523e6e06f62998c7a06520798be92c4"
"1559e0dfb21ee6f67dbd996ae0bb0c67987706db3144199202890de37cb7d8b4")
sha256sums=('178bf04ffc5edd9acfa8188acbeeab16e24e4e43f4465729e8619f844e5901f2'
'dd717ff5096ea2ffd4c4793461269eee089e54e7db1184669d8f00c0fc67f1a4'
'1559e0dfb21ee6f67dbd996ae0bb0c67987706db3144199202890de37cb7d8b4')
prepare(){
cd "${srcdir}/${_realname}-${pkgver}"
patch -Np1 -i "${srcdir}/0001-xavs-0.1.55-fix-dynamic-build.patch"
patch -Np1 -i "${srcdir}/0002-xavs-0.1.55-fix-asm.patch"
sed -i -e 's|$(CC) -o $@ $(OBJCLI) $(LDFLAGS) -L. -lxavs|$(CC) -o $@ $(OBJCLI) -L. -lxavs $(LDFLAGS)|' Makefile
sed -i -e 's|xavs$(EXE): $(OBJCLI) $(SONAME)|xavs$(EXE): $(OBJCLI) $(SONAME) libxavs.a|' Makefile
}
build() {
[[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
mkdir -p "${srcdir}/build-${MINGW_CHOST}"
cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
cd "${srcdir}/build-${MINGW_CHOST}"
cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}/${_realname}-${pkgver}"
cd "${_realname}-${pkgver}"
./configure \
--prefix=${MINGW_PREFIX} \
--host=${MINGW_CHOST} \
@@ -43,6 +40,6 @@ build() {
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}/${_realname}-${pkgver}"
cd "${srcdir}/build-${MINGW_CHOST}"
make DESTDIR=${pkgdir} install
}

View File

@@ -4,54 +4,77 @@ _realname=xlnt
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.5.0
pkgrel=1
pkgrel=2
pkgdesc="User-friendly xlsx library for C++14 (mingw-w64)"
url="https://github.com/tfussell/xlnt"
license=('MIT')
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cmake"
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"unzip")
options=('strip' '!debug' 'staticlibs')
source=("${_realname}-${pkgver}.zip"::"https://github.com/tfussell/xlnt/archive/v${pkgver}.zip")
noextract=("${_realname}-${pkgver}.zip") # bsdtar fails extracting the symlinks
sha256sums=('27db56b53745bf40e94edc531eb54ef67a75a40c9acc47609f0d8c8950b46d4c')
prepare() {
unzip -oq "${_realname}-${pkgver}.zip" -d ${srcdir}
# Causes error in clang, not so important
cd "${srcdir}/${_realname}-${pkgver}"
rm "third-party/libstudxml/version"
}
build() {
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
mkdir ${srcdir}/build-${MINGW_CHOST}
cd ${srcdir}/build-${MINGW_CHOST}
declare -a extra_config
declare -a _extra_config
if check_option "debug" "n"; then
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
_extra_config+=("-DCMAKE_BUILD_TYPE=Release")
else
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
_extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
for _static in "ON" "OFF"; do
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DSTATIC=${_static} \
-DTESTS=OFF \
../${_realname}-${pkgver}
echo "Building static library"
[[ -d "${srcdir}/build-${CARCH}-static" ]] && rm -rf "${srcdir}/build-${CARCH}-static"
mkdir -p "${srcdir}/build-${CARCH}-static" && cd "${srcdir}/build-${CARCH}-static"
make
done
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake.exe \
-G "Ninja" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_PREFIX_PATH=${MINGW_PREFIX} \
"${_extra_config[@]}" \
-DSTATIC=ON \
-DTESTS=OFF \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake.exe --build ./
echo "Building shared library"
[[ -d "${srcdir}/build-${CARCH}-shared" ]] && rm -rf "${srcdir}/build-${CARCH}-shared"
mkdir -p "${srcdir}/build-${CARCH}-shared" && cd "${srcdir}/build-${CARCH}-shared"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake.exe \
-G "Ninja" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_PREFIX_PATH=${MINGW_PREFIX} \
"${_extra_config[@]}" \
-DSTATIC=OFF \
-DTESTS=OFF \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake.exe --build ./
}
package() {
cd ${srcdir}/build-${MINGW_CHOST}
make DESTDIR="${pkgdir}" install
install -Dm644 "source/libxlnt.a" "${pkgdir}${MINGW_PREFIX}/lib/libxlnt.a"
cd "${srcdir}/build-${CARCH}-static"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
cd "${srcdir}/build-${CARCH}-shared"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
cd "${srcdir}/${_realname}-${pkgver}"
install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
}

View File

@@ -0,0 +1,22 @@
--- a/build/generic/configure.in
+++ b/build/generic/configure.in
@@ -324,7 +324,7 @@
AC_MSG_RESULT([ok])
STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
- SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
+ SPECIFIC_LDFLAGS="-shared -Wl,--out-implib,\$@.a libxvidcore.def"
SPECIFIC_CFLAGS="-mno-cygwin"
;;
darwin*)
--- a/build/generic/configure
+++ a/build/generic/configure
@@ -4394,7 +4394,7 @@
$as_echo "ok" >&6; }
STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
- SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
+ SPECIFIC_LDFLAGS="-shared -Wl,--out-implib,\$@.a libxvidcore.def"
SPECIFIC_CFLAGS="-mno-cygwin"
;;
darwin*)

View File

@@ -4,7 +4,7 @@ _realname=xvidcore
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.3.7
pkgrel=1
pkgrel=2
pkgdesc="XviD is an open source MPEG-4 video codec (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -14,11 +14,14 @@ options=('strip' '!libtool' 'staticlibs')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-yasm")
source=(http://downloads.xvid.com/downloads/${_realname}-${pkgver}.tar.bz2)
sha256sums=('aeeaae952d4db395249839a3bd03841d6844843f5a4f84c271ff88f7aa1acff7')
source=(http://downloads.xvid.com/downloads/${_realname}-${pkgver}.tar.bz2
0001-remove-dll-option-clang.patch)
sha256sums=('aeeaae952d4db395249839a3bd03841d6844843f5a4f84c271ff88f7aa1acff7'
'e100d96f183bf0e7334ab6ae12ded47a72157fc3976c10db32377ab8cda22715')
prepare() {
cd ${srcdir}/${_realname}
cd "${srcdir}/${_realname}"
patch -Np1 -i "${srcdir}/0001-remove-dll-option-clang.patch"
}
build() {

View File

@@ -3,7 +3,7 @@
_realname=yices
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.6.1
pkgver=2.6.2
pkgrel=1
pkgdesc="Yices is a fast SMT solver with C and Python bindings."
arch=('any')
@@ -15,18 +15,14 @@ makedepends=("dos2unix"
"gperf")
options=() # 'debug')
source=("${_realname}-${pkgver}.tar.gz"::"https://yices.csl.sri.com/releases/${pkgver}/yices-${pkgver}-src.tar.gz")
sha256sums=('c37340616483f584ee403a06ab01fc9151a834e07a4d937a155b1e6a73b3b93e')
apply_patch_with_msg() {
for _fname in "$@"
do
msg2 "Applying ${_fname}"
patch -Nbp1 -i "${srcdir}"/${_fname}
done
}
sha256sums=('1f205c056dd430f830c688fba6c87d8bd07bd8fa05f65936e12c27e71fa3576a')
prepare() {
msg "Nothing to prepare"
cd "${srcdir}"/yices-${pkgver}
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
sed -i "s/-Wl,--no-undefined //g" src/Makefile
fi
}
build() {