From 5e694cee1dd8f664ab145570742ba7cd3186818f Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 25 Jan 2016 19:37:59 +1000 Subject: [PATCH] New version 1.9.2 Switch to GStreamer API 1.0 --- .abf.yml | 6 +++--- wine.spec | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.abf.yml b/.abf.yml index 1840b27..f5ec9b5 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,5 @@ sources: - wine-1.9.1.tar.bz2: eaa62c1ed48eb3cdf5ef82a2405161d89a34a6b9 - wine-1.9.1.tar.bz2.sign: c9a3e4e5ec85630eaebf5d2b262afa1aed5d3105 - wine-staging-1.9.1.tar.gz: cac4c7591c7364488ae70ee6fb5bd8b6e01d881d wine-d3d9-patches-wine-d3d9-1.9.1.tar.gz: 697640f4da1feccc2233d059bb0a10a5562e06bb + wine-1.9.2.tar.bz2: 49b359d445a95446ff3151745085ff4dfc7dae63 + wine-1.9.2.tar.bz2.sign: e57090c12747cf0852f29f62db2880c5ff7ae910 + wine-staging-1.9.2.tar.gz: d3bc4f664a1149d01cee61d0a1a40aabef8e6cc3 diff --git a/wine.spec b/wine.spec index bb7cc3d..617c550 100644 --- a/wine.spec +++ b/wine.spec @@ -10,6 +10,8 @@ %define libname %mklibname %{name} %{major} %define devname %mklibname %{name} -d +%define d3d_version 1.9.1 + # On 32-bit we have # wine32 - those 32-bit binaries that are also used on 64-bit for 32-bit support # wine - all other files (requires 'wine32') @@ -19,7 +21,7 @@ Summary: WINE Is Not An Emulator - runs MS Windows programs Name: wine -Version: 1.9.1 +Version: 1.9.2 Release: 1 Epoch: 2 License: LGPLv2+ @@ -34,7 +36,7 @@ Source2: wine.init Source3: wine-staging-%{version}.tar.gz # Wine Gallium Nine, from github by tag # https://github.com/NP-Hardass/wine-d3d9-patches/archive/wine-d3d9-%{version}.tar.gz -Source4: wine-d3d9-patches-wine-d3d9-%{version}.tar.gz +Source4: wine-d3d9-patches-wine-d3d9-%{d3d_version}.tar.gz Source10: wine.rpmlintrc Source11: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks Source12: http://kegel.com/wine/wisotool @@ -78,8 +80,8 @@ BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(lcms) BuildRequires: pkgconfig(libgphoto2) @@ -278,7 +280,7 @@ make -C "patches" DESTDIR="%{_builddir}/wine-%{version}" install # Gallium Nine tar -xf %{SOURCE4} -patch -p1 < wine-d3d9-patches-wine-d3d9-%{version}/wine-d3d9.patch +patch -p1 < wine-d3d9-patches-wine-d3d9-%{d3d_version}/wine-d3d9.patch sed -i 's,@MDKVERSION@,%{mdvver},' dlls/ntdll/server.c