Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upd(wine-staging-git): 9.8 -> 10.0 #6770

Merged
merged 3 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions packages/wine-staging-git/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pkgbase = wine-staging-git
pkgver = 9.8
gives = wine-staging-git
pkgver = 10.0
pkgdesc = A compatibility layer for running Windows programs - Staging branch
url = https://www.wine-staging.com
arch = any
Expand Down Expand Up @@ -108,46 +109,27 @@ pkgbase = wine-staging-git
makedepends = libvulkan-dev:i386
makedepends = libx11-dev:i386
makedepends = libwayland-dev
optdepends = libcapi20-dev: for ISDN software
optdepends = liblcms2-dev: color management
optdepends = libcups2-dev: printing support
optdepends = libgphoto2-dev: still image support
optdepends = libsane-dev: scanning support
optdepends = libgsm1-dev: GSM audio codec
optdepends = libkrb5-dev: kerberos authentication support
optdepends = libldap2-dev: LDAP support
optdepends = samba-dev: SMB support
optdepends = ocl-icd-opencl-dev: opencl support
optdepends = libpcap-dev: packet capture support
optdepends = libusb-1.0-0-dev: USB support
optdepends = libv4l-dev: video capture support
optdepends = libcapi20-dev:i386: for 32 bit ISDN software
optdepends = liblcms2-dev:i386: 32-bit color management
optdepends = libcups2-dev:i386: 32-bit printing support
optdepends = libgphoto2-dev:i386: 32-bit still image support
optdepends = libsane-dev:i386: 32-bit scanning support
optdepends = libgsm1-dev:i386: 32-bit GSM audio codec
optdepends = libkrb5-dev:i386: 32-bit kerberos authentication support
optdepends = libldap2-dev:i386: 32-bit LDAP support
optdepends = samba-dev:i386: 32-bit SMB support
optdepends = ocl-icd-opencl-dev:i386: 32-bit opencl support
optdepends = libpcap-dev:i386: 32-bit packet capture support
optdepends = libusb-1.0-0-dev:i386: 32-bit USB support
optdepends = libv4l-dev:i386: 32-bit video capture support
breaks = wine
breaks = wine64
breaks = wine32:i386
breaks = libwine
breaks = libwine:i386
breaks = wine-staging-i386:i386
breaks = fonts-wine
replaces = wine
replaces = wine64
replaces = wine32:i386
replaces = libwine
replaces = libwine:i386
replaces = wine-staging-i386:i386
replaces = fonts-wine
conflicts = wine-staging
license = LGPL-2.1-or-later
maintainer = xdavius <[email protected]>
source = git+https://gitlab.winehq.org/wine/wine-staging.git
Expand Down
56 changes: 24 additions & 32 deletions packages/wine-staging-git/wine-staging-git.pacscript
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
pkgname="wine-staging-git"
gives="wine-staging-git"
pkgdesc="A compatibility layer for running Windows programs - Staging branch"
arch=("any")
pkgver="9.8"
pkgver="10.0"
url="https://www.wine-staging.com"
license=("LGPL-2.1-or-later")
maintainer=("xdavius <[email protected]>")
Expand All @@ -19,39 +20,28 @@ sha256sums=(
)
makedepends=("devscripts" "autotools-dev" "autoconf" "libjpeg-turbo8-dev | libjpeg62-turbo-dev" "libjpeg-turbo8-dev:i386 | libjpeg62-turbo-dev:i386" "libasound2-dev" "libpulse-dev" "libdbus-1-dev" "libfontconfig-dev" "libfreetype-dev" "libgnutls28-dev" "libpng-dev" "libtiff-dev" "libgl-dev" "libunwind-dev" "libxml2-dev" "libxslt1-dev" "libfaudio-dev" "libgstreamer1.0-dev" "libgstreamer-plugins-base1.0-dev" "libmpg123-dev" "libjxr-dev" "libosmesa6-dev" "libsdl2-dev" "libudev-dev" "libvkd3d-dev" "libvulkan-dev" "gcc-mingw-w64" "gcc-multilib" "g++-multilib" "flex" "bison" "libx11-dev" "libx11-dev:i386" "xorg-dev" "libfreetype-dev:i386" "oss4-dev | alsa-oss" "libasound2-dev:i386" "libpulse-dev:i386" "libdbus-1-dev:i386" "libfontconfig-dev:i386" "libfreetype-dev:i386" "libgnutls28-dev:i386" "libpng-dev:i386" "libtiff-dev:i386" "libgl-dev:i386" "libunwind-dev:i386" "libxml2-dev:i386" "libxslt1-dev:i386" "libgstreamer1.0-dev:i386" "libmpg123-dev:i386" "libosmesa6-dev:i386" "libsdl2-dev:i386" "libudev-dev:i386" "libvulkan-dev:i386" "libx11-dev:i386" "libwayland-dev")
depends=("libjpeg-turbo8-dev | libjpeg62-turbo-dev" "libjpeg-turbo8-dev:i386 | libjpeg62-turbo-dev:i386" "libasound2-dev" "libpulse-dev" "libdbus-1-dev" "libfontconfig-dev" "libfreetype-dev" "libgnutls28-dev" "libpng-dev" "libtiff-dev" "libgl-dev" "libunwind-dev" "libxml2-dev" "libxslt1-dev" "libfaudio-dev" "libgstreamer1.0-dev" "libgstreamer-plugins-base1.0-dev" "libmpg123-dev" "libjxr-dev" "libosmesa6-dev" "libsdl2-dev" "libudev-dev" "libvkd3d-dev" "libvulkan-dev" "libx11-dev" "libx11-dev:i386" "xorg-dev" "libfreetype-dev:i386" "oss4-dev | alsa-oss" "libasound2-dev:i386" "libpulse-dev:i386" "libdbus-1-dev:i386" "libfontconfig-dev:i386" "libfreetype-dev:i386" "libgnutls28-dev:i386" "libpng-dev:i386" "libtiff-dev:i386" "libgl-dev:i386" "libunwind-dev:i386" "libxml2-dev:i386" "libxslt1-dev:i386" "libgstreamer1.0-dev:i386" "libmpg123-dev:i386" "libosmesa6-dev:i386" "libsdl2-dev:i386" "libudev-dev:i386" "libvulkan-dev:i386" "libx11-dev:i386")
breaks=("wine" "wine64" "wine32:i386" "libwine" "libwine:i386" "wine-staging-i386:i386" "fonts-wine")
replaces=("wine" "wine64" "wine32:i386" "libwine" "libwine:i386" "wine-staging-i386:i386" "fonts-wine")
optdepends=("libcapi20-dev: for ISDN software"
"liblcms2-dev: color management"
conflicts=("wine-staging")
optdepends=("liblcms2-dev: color management"
"libcups2-dev: printing support"
"libgphoto2-dev: still image support"
"libsane-dev: scanning support"
"libgsm1-dev: GSM audio codec"
"libkrb5-dev: kerberos authentication support"
"libldap2-dev: LDAP support"
"samba-dev: SMB support"
"ocl-icd-opencl-dev: opencl support"
"libpcap-dev: packet capture support"
"libusb-1.0-0-dev: USB support"
"libv4l-dev: video capture support"
"libcapi20-dev:i386: for 32 bit ISDN software"
"liblcms2-dev:i386: 32-bit color management"
"libcups2-dev:i386: 32-bit printing support"
"libgphoto2-dev:i386: 32-bit still image support"
"libsane-dev:i386: 32-bit scanning support"
"libgsm1-dev:i386: 32-bit GSM audio codec"
"libkrb5-dev:i386: 32-bit kerberos authentication support"
"libldap2-dev:i386: 32-bit LDAP support"
"samba-dev:i386: 32-bit SMB support"
"ocl-icd-opencl-dev:i386: 32-bit opencl support"
"libpcap-dev:i386: 32-bit packet capture support"
"libusb-1.0-0-dev:i386: 32-bit USB support"
"libv4l-dev:i386: 32-bit video capture support")

pkgver() {
git -C wine-staging describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//;s/\.rc/rc/'
}

prepare() {
cd "${srcdir}"/wine
rm -rf build-{32,64}
Expand Down Expand Up @@ -83,17 +73,17 @@ build() {
ls -l
cd "wine64-build"
../configure \
--prefix='/usr' \
--libdir='/usr/lib' \
--prefix='/usr/local' \
Xdavius marked this conversation as resolved.
Show resolved Hide resolved
--libdir='/usr/local/lib' \
--with-x \
--with-gstreamer \
--enable-win64
make -j"${NCPU}"

cd "../wine32-build"
../configure \
--prefix='/usr' \
--libdir='/usr/lib32' \
--prefix='/usr/local' \
--libdir='/usr/local/lib32' \
--with-x \
--with-gstreamer \
--with-wine64="../wine64-build"
Expand All @@ -103,24 +93,26 @@ build() {
package() {
cd "${srcdir}"/wine
cd "wine32-build"
mkdir -p "${pkgdir}/usr/lib32/wine"
make prefix="${pkgdir}/usr" \
libdir="${pkgdir}/usr/lib32" \
dlldir="${pkgdir}/usr/lib32/wine" \
mkdir -p "${pkgdir}/usr/local/lib32/wine"
make prefix="${pkgdir}/usr/local" \
libdir="${pkgdir}/usr/local/lib32" \
dlldir="${pkgdir}/usr/local/lib32/wine" \
install
#uncomment to create wine32 binary if needed
#mv "${pkgdir}"/usr/local/bin/wine "${pkgdir}"/usr/local/bin/wine32
cd "../wine64-build"
mkdir -p "${pkgdir}/usr/lib/wine"
make prefix="${pkgdir}/usr" \
libdir="${pkgdir}/usr/lib" \
dlldir="${pkgdir}/usr/lib/wine" \
mkdir -p "${pkgdir}/usr/local/lib/wine"
make prefix="${pkgdir}/usr/local" \
libdir="${pkgdir}/usr/local/lib" \
dlldir="${pkgdir}/usr/local/lib/wine" \
install

install -d -m755 "${pkgdir}/usr/share/fontconfig/conf.default"
install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/share/fontconfig/conf.avail/30-win32-aliases.conf"
install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/share/fontconfig/conf.default/30-win32-aliases.conf"
install -d -m755 "${pkgdir}/usr/local/share/fontconfig/conf.default"
install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/local/share/fontconfig/conf.avail/30-win32-aliases.conf"
install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/local/share/fontconfig/conf.default/30-win32-aliases.conf"

install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/lib/binfmt.d/wine.conf"
install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/local/lib/binfmt.d/wine.conf"

i686-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/lib32/wine/i386-windows"/*.dll
x86_64-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/lib/wine/x86_64-windows"/*.dll
i686-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/local/lib32/wine/i386-windows"/*.dll
x86_64-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/local/lib/wine/x86_64-windows"/*.dll
}
24 changes: 3 additions & 21 deletions srclist
Original file line number Diff line number Diff line change
Expand Up @@ -12568,7 +12568,8 @@ pkgbase = windscribe-beta-gui-deb
pkgname = windscribe-beta-gui-deb
---
pkgbase = wine-staging-git
pkgver = 9.8
gives = wine-staging-git
pkgver = 10.0
pkgdesc = A compatibility layer for running Windows programs - Staging branch
url = https://www.wine-staging.com
arch = any
Expand Down Expand Up @@ -12677,46 +12678,27 @@ pkgbase = wine-staging-git
makedepends = libvulkan-dev:i386
makedepends = libx11-dev:i386
makedepends = libwayland-dev
optdepends = libcapi20-dev: for ISDN software
optdepends = liblcms2-dev: color management
optdepends = libcups2-dev: printing support
optdepends = libgphoto2-dev: still image support
optdepends = libsane-dev: scanning support
optdepends = libgsm1-dev: GSM audio codec
optdepends = libkrb5-dev: kerberos authentication support
optdepends = libldap2-dev: LDAP support
optdepends = samba-dev: SMB support
optdepends = ocl-icd-opencl-dev: opencl support
optdepends = libpcap-dev: packet capture support
optdepends = libusb-1.0-0-dev: USB support
optdepends = libv4l-dev: video capture support
optdepends = libcapi20-dev:i386: for 32 bit ISDN software
optdepends = liblcms2-dev:i386: 32-bit color management
optdepends = libcups2-dev:i386: 32-bit printing support
optdepends = libgphoto2-dev:i386: 32-bit still image support
optdepends = libsane-dev:i386: 32-bit scanning support
optdepends = libgsm1-dev:i386: 32-bit GSM audio codec
optdepends = libkrb5-dev:i386: 32-bit kerberos authentication support
optdepends = libldap2-dev:i386: 32-bit LDAP support
optdepends = samba-dev:i386: 32-bit SMB support
optdepends = ocl-icd-opencl-dev:i386: 32-bit opencl support
optdepends = libpcap-dev:i386: 32-bit packet capture support
optdepends = libusb-1.0-0-dev:i386: 32-bit USB support
optdepends = libv4l-dev:i386: 32-bit video capture support
breaks = wine
breaks = wine64
breaks = wine32:i386
breaks = libwine
breaks = libwine:i386
breaks = wine-staging-i386:i386
breaks = fonts-wine
replaces = wine
replaces = wine64
replaces = wine32:i386
replaces = libwine
replaces = libwine:i386
replaces = wine-staging-i386:i386
replaces = fonts-wine
conflicts = wine-staging
license = LGPL-2.1-or-later
maintainer = xdavius <[email protected]>
source = git+https://gitlab.winehq.org/wine/wine-staging.git
Expand Down
Loading