system/wine-staging: Updated for version 3.18.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
parent
a5efa64d75
commit
5237e46b95
|
@ -1,63 +0,0 @@
|
||||||
diff -u -r wine/dlls/gdi32/freetype.c wine-ft281/dlls/gdi32/freetype.c
|
|
||||||
--- wine/dlls/gdi32/freetype.c 2017-10-04 18:01:36.000000000 +0200
|
|
||||||
+++ wine-ft281/dlls/gdi32/freetype.c 2017-10-10 10:29:17.506632615 +0200
|
|
||||||
@@ -996,18 +996,23 @@
|
|
||||||
|
|
||||||
static BOOL is_subpixel_rendering_enabled( void )
|
|
||||||
{
|
|
||||||
-#ifdef FT_LCD_FILTER_H
|
|
||||||
static int enabled = -1;
|
|
||||||
if (enabled == -1)
|
|
||||||
{
|
|
||||||
- enabled = (pFT_Library_SetLcdFilter &&
|
|
||||||
- pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
|
|
||||||
+ /* >= 2.8.1 provides LCD rendering without filters */
|
|
||||||
+ if (FT_Version.major > 2 ||
|
|
||||||
+ FT_Version.major == 2 && FT_Version.minor > 8 ||
|
|
||||||
+ FT_Version.major == 2 && FT_Version.minor == 8 && FT_Version.patch >= 1)
|
|
||||||
+ enabled = TRUE;
|
|
||||||
+#ifdef FT_LCD_FILTER_H
|
|
||||||
+ else if (pFT_Library_SetLcdFilter &&
|
|
||||||
+ pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature)
|
|
||||||
+ enabled = TRUE;
|
|
||||||
+#endif
|
|
||||||
+ else enabled = FALSE;
|
|
||||||
TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
|
|
||||||
}
|
|
||||||
return enabled;
|
|
||||||
-#else
|
|
||||||
- return FALSE;
|
|
||||||
-#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -7271,7 +7276,6 @@
|
|
||||||
case WINE_GGO_HBGR_BITMAP:
|
|
||||||
case WINE_GGO_VRGB_BITMAP:
|
|
||||||
case WINE_GGO_VBGR_BITMAP:
|
|
||||||
-#ifdef FT_LCD_FILTER_H
|
|
||||||
{
|
|
||||||
switch (ft_face->glyph->format)
|
|
||||||
{
|
|
||||||
@@ -7357,8 +7361,11 @@
|
|
||||||
if ( needsTransform )
|
|
||||||
pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki);
|
|
||||||
|
|
||||||
+#ifdef FT_LCD_FILTER_H
|
|
||||||
if ( pFT_Library_SetLcdFilter )
|
|
||||||
pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT );
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
pFT_Render_Glyph (ft_face->glyph, render_mode);
|
|
||||||
|
|
||||||
src = ft_face->glyph->bitmap.buffer;
|
|
||||||
@@ -7439,9 +7446,6 @@
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
-#else
|
|
||||||
- return GDI_ERROR;
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
case GGO_NATIVE:
|
|
||||||
{
|
|
|
@ -30,7 +30,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
PRGNAM=wine-staging
|
PRGNAM=wine-staging
|
||||||
VERSION=${VERSION:-3.17}
|
VERSION=${VERSION:-3.18}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
|
@ -120,9 +120,6 @@ find -L . \
|
||||||
# Fix for flex.
|
# Fix for flex.
|
||||||
patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
|
patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
|
||||||
|
|
||||||
# freetype harmony fix.
|
|
||||||
patch -Np1 < $CWD/harmony-fix.diff
|
|
||||||
|
|
||||||
# fix path of opencl headers.
|
# fix path of opencl headers.
|
||||||
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
|
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
|
||||||
|
|
||||||
|
@ -158,17 +155,15 @@ if [ -n "$WIN64" ]; then
|
||||||
--disable-tests \
|
--disable-tests \
|
||||||
--build=$BUILD_ARCH
|
--build=$BUILD_ARCH
|
||||||
|
|
||||||
#NUMJOBS=${NUMJOBS:-"-s -j6 -l7"}
|
|
||||||
#make $NUMJOBS depend || exit 1
|
|
||||||
#make $NUMJOBS || exit 1
|
|
||||||
|
|
||||||
make depend
|
make depend
|
||||||
make
|
make
|
||||||
|
#NUMJOBS=${NUMJOBS:-"-s -j6 -l7"}
|
||||||
|
#make depend $NUMJOBS || exit 1
|
||||||
|
#make $NUMJOBS || exit 1
|
||||||
make install DESTDIR=$PKG
|
make install DESTDIR=$PKG
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ -z "$NOWIN32" ]; then
|
if [ -z "$NOWIN32" ]; then
|
||||||
mkdir wine32
|
mkdir wine32
|
||||||
cd wine32
|
cd wine32
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
PRGNAM="wine-staging"
|
PRGNAM="wine-staging"
|
||||||
VERSION="3.17"
|
VERSION="3.18"
|
||||||
HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
|
HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
|
||||||
DOWNLOAD="https://dl.winehq.org/wine/source/3.x/wine-3.17.tar.xz \
|
DOWNLOAD="https://dl.winehq.org/wine/source/3.x/wine-3.18.tar.xz \
|
||||||
https://github.com/wine-staging/wine-staging/archive/v3.17/wine-staging-3.17.tar.gz"
|
https://github.com/wine-staging/wine-staging/archive/v3.18/wine-staging-3.18.tar.gz"
|
||||||
MD5SUM="1b852a6e0e047525be75660914b3136b \
|
MD5SUM="8a86c199685c1463750c1fae8b499526 \
|
||||||
01f1aac33baee919616b7d456915f42c"
|
9c910af9d502414465a439391d1a1bf6"
|
||||||
DOWNLOAD_x86_64="UNSUPPORTED"
|
DOWNLOAD_x86_64="UNSUPPORTED"
|
||||||
MD5SUM_x86_64=""
|
MD5SUM_x86_64=""
|
||||||
REQUIRES=""
|
REQUIRES=""
|
||||||
|
|
Loading…
Reference in New Issue