[arch-commits] Commit in wine-staging/trunk (PKGBUILD bug40032.patch)

Felix Yan fyan at archlinux.org
Mon Jan 25 06:29:53 UTC 2016


    Date: Monday, January 25, 2016 @ 07:29:52
  Author: fyan
Revision: 158812

upgpkg: wine-staging 1.9.2-1

enable gstreamer

Added:
  wine-staging/trunk/bug40032.patch
Modified:
  wine-staging/trunk/PKGBUILD

----------------+
 PKGBUILD       |  132 +++++++++++++++++++++++++--------------------------
 bug40032.patch |  141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-25 06:04:14 UTC (rev 158811)
+++ PKGBUILD	2016-01-25 06:29:52 UTC (rev 158812)
@@ -6,15 +6,17 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine-staging
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
-        30-win32-aliases.conf)
-sha1sums=('d18ac6f55a1c6333cfe6961980685fad4404c695'
-          '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+        30-win32-aliases.conf
+        bug40032.patch)
+sha1sums=('0caaea9075d73c2432aa7e91d77aaf79fcc3268a'
+          '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+          '0b6fed0e922ea72e7f3e4b0672e07131448cb207')
 
 pkgdesc="A compatibility layer for running Windows programs - Staging branch"
 url="http://www.wine-staging.com"
@@ -24,68 +26,70 @@
 install=wine.install
 
 _depends=(
-  attr            lib32-attr
-  fontconfig      lib32-fontconfig
-  lcms2           lib32-lcms2
-  libxml2         lib32-libxml2
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  freetype2       lib32-freetype2
-  glu             lib32-glu
-  libsm           lib32-libsm
-  gcc-libs        lib32-gcc-libs
-  libpcap         lib32-libpcap
+  attr             lib32-attr
+  fontconfig       lib32-fontconfig
+  lcms2            lib32-lcms2
+  libxml2          lib32-libxml2
+  libxcursor       lib32-libxcursor
+  libxrandr        lib32-libxrandr
+  libxdamage       lib32-libxdamage
+  libxi            lib32-libxi
+  gettext          lib32-gettext
+  freetype2        lib32-freetype2
+  glu              lib32-glu
+  libsm            lib32-libsm
+  gcc-libs         lib32-gcc-libs
+  libpcap          lib32-libpcap
   desktop-file-utils
 )
 
 makedepends=(autoconf ncurses bison perl fontforge flex
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  gnutls          lib32-gnutls
-  libxinerama     lib32-libxinerama
-  libxcomposite   lib32-libxcomposite
-  libxmu          lib32-libxmu
-  libxxf86vm      lib32-libxxf86vm
-  libldap         lib32-libldap
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  alsa-lib        lib32-alsa-lib
-  libxcomposite   lib32-libxcomposite
-  mesa            lib32-mesa
-  mesa-libgl      lib32-mesa-libgl
-  libcl           lib32-libcl
-  libxslt         lib32-libxslt
-  libpulse        lib32-libpulse
-  libva           lib32-libva
-  gtk3            lib32-gtk3
+  'gcc>=4.5.0-2'   'gcc-multilib>=4.5.0-2'
+  giflib                lib32-giflib
+  libpng                lib32-libpng
+  gnutls                lib32-gnutls
+  libxinerama           lib32-libxinerama
+  libxcomposite         lib32-libxcomposite
+  libxmu                lib32-libxmu
+  libxxf86vm            lib32-libxxf86vm
+  libldap               lib32-libldap
+  mpg123                lib32-mpg123
+  openal                lib32-openal
+  v4l-utils             lib32-v4l-utils
+  alsa-lib              lib32-alsa-lib
+  libxcomposite         lib32-libxcomposite
+  mesa                  lib32-mesa
+  mesa-libgl            lib32-mesa-libgl
+  libcl                 lib32-libcl
+  libxslt               lib32-libxslt
+  libpulse              lib32-libpulse
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
   samba
   opencl-headers
 )
   
 optdepends=(
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  libldap         lib32-libldap
-  gnutls          lib32-gnutls
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  libjpeg-turbo   lib32-libjpeg-turbo
-  libxcomposite   lib32-libxcomposite
-  libxinerama     lib32-libxinerama
-  ncurses         lib32-ncurses
-  libcl           lib32-libcl
-  libxslt         lib32-libxslt
-  libva           lib32-libva
-  gtk3            lib32-gtk3
+  giflib                lib32-giflib
+  libpng                lib32-libpng
+  libldap               lib32-libldap
+  gnutls                lib32-gnutls
+  mpg123                lib32-mpg123
+  openal                lib32-openal
+  v4l-utils             lib32-v4l-utils
+  libpulse              lib32-libpulse
+  alsa-plugins          lib32-alsa-plugins
+  alsa-lib              lib32-alsa-lib
+  libjpeg-turbo         lib32-libjpeg-turbo
+  libxcomposite         lib32-libxcomposite
+  libxinerama           lib32-libxinerama
+  ncurses               lib32-ncurses
+  libcl                 lib32-libcl
+  libxslt               lib32-libxslt
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base
   cups
   samba           dosbox
 )
@@ -108,11 +112,11 @@
   # Allow ccache to work
   mv wine-patched-staging-$_pkgbasever $pkgname
 
+  # https://bugs.winehq.org/show_bug.cgi?id=40032
+  (cd $pkgname; patch -p1 -i ../bug40032.patch)
+
   sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
 
-  # These additional CPPFLAGS solve FS#27662 and FS#34195
-  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
   # Get rid of old build dirs
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build
@@ -130,10 +134,9 @@
       --prefix=/usr \
       --libdir=/usr/lib \
       --with-x \
-      --without-gstreamer \
+      --with-gstreamer \
       --enable-win64 \
       --with-xattr
-    # Gstreamer was disabled for FS#33655
 
     make
 
@@ -150,12 +153,9 @@
   ../$pkgname/configure \
     --prefix=/usr \
     --with-x \
-    --without-gstreamer \
+    --with-gstreamer \
     --with-xattr \
     "${_wine32opts[@]}"
-
-  # These additional flags solve FS#23277
-  make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
 }
 
 package() {

Added: bug40032.patch
===================================================================
--- bug40032.patch	                        (rev 0)
+++ bug40032.patch	2016-01-25 06:29:52 UTC (rev 158812)
@@ -0,0 +1,141 @@
+From f84cb2913cb755152d98c278f3ed6927167c9b2b Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian at fds-team.de>
+Date: Sun, 24 Jan 2016 16:06:47 +0100
+Subject: shcore: Add SetProcessDpiAwareness stub.
+
+---
+ dlls/shcore/Makefile.in   |  3 +++
+ dlls/shcore/main.c        | 49 +++++++++++++++++++++++++++++++++++++++++++++++
+ dlls/shcore/shcore.spec   |  2 +-
+ include/Makefile.in       |  1 +
+ include/shellscalingapi.h | 29 ++++++++++++++++++++++++++++
+ 5 files changed, 83 insertions(+), 1 deletion(-)
+ create mode 100644 dlls/shcore/main.c
+ create mode 100644 include/shellscalingapi.h
+
+diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in
+index dd5f08f..ec2e95f 100644
+--- a/dlls/shcore/Makefile.in
++++ b/dlls/shcore/Makefile.in
+@@ -1 +1,4 @@
+ MODULE    = shcore.dll
++
++C_SRCS = \
++	main.c
+diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c
+new file mode 100644
+index 0000000..0e59d38
+--- /dev/null
++++ b/dlls/shcore/main.c
+@@ -0,0 +1,49 @@
++/*
++ * Copyright 2016 Sebastian Lackner
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#include "config.h"
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "shellscalingapi.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(shcore);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;  /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
++
++HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value)
++{
++    FIXME("(%u): stub\n", value);
++    return E_NOTIMPL;
++}
+diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec
+index 12a4ef3..1624319 100644
+--- a/dlls/shcore/shcore.spec
++++ b/dlls/shcore/shcore.spec
+@@ -78,6 +78,6 @@
+ @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi
+ @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode
+ @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID
+-@ stub SetProcessDpiAwareness
++@ stdcall SetProcessDpiAwareness(long)
+ @ stub SetProcessReference
+ @ stub UnregisterScaleChangeEvent
+diff --git a/include/Makefile.in b/include/Makefile.in
+index 199de7a..c907afe4 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -570,6 +570,7 @@ HEADER_SRCS = \
+ 	sfc.h \
+ 	shdispid.h \
+ 	shellapi.h \
++	shellscalingapi.h \
+ 	shlguid.h \
+ 	shlobj.h \
+ 	shlwapi.h \
+diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h
+new file mode 100644
+index 0000000..6d7a167
+--- /dev/null
++++ b/include/shellscalingapi.h
+@@ -0,0 +1,29 @@
++/*
++ * Copyright 2016 Sebastian Lackner
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#ifndef __WINE_SHELLSCALINGAPI_H
++#define __WINE_SHELLSCALINGAPI_H
++
++typedef enum PROCESS_DPI_AWARENESS
++{
++    PROCESS_DPI_UNAWARE                 = 0,
++    PROCESS_SYSTEM_DPI_AWARE            = 1,
++    PROCESS_PER_MONITOR_DPI_AWARE       = 2,
++} PROCESS_DPI_AWARENESS;
++
++#endif /* __WINE_SHELLSCALINGAPI_H */
+-- 
+2.6.4
+



More information about the arch-commits mailing list