[steam/el8: 6/6] Small updates
by Simone Caronni
commit 66e072dbee1e8f2244c8f9a1ef25b89bd00e32be
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Sun Feb 9 18:58:18 2020 +0100
Small updates
README.Fedora | 81 +++++++++++++++++++++++++++++---------------------------
steam-3570.patch | 10 -------
steam.csh | 5 ++++
steam.sh | 5 ++++
steam.spec | 32 +++++++++++++---------
5 files changed, 71 insertions(+), 62 deletions(-)
---
diff --git a/README.Fedora b/README.Fedora
index e2a0460..5e50a17 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -16,38 +16,37 @@ And launch the client again, it will adjust all the symlinks for folders, saves,
etc. by itself. Even the desktop / system shortcuts for the games work because
they launch Steam (which is in the path) with the appropriate Steam game ID.
-In-Home Streaming (hardware decoding/encoding)
+Steam Remote Play (hardware decoding/encoding)
==============================================
-In-Home Streaming hardware decoding and encoding are exposed through different
+Steam Remote Play hardware decoding and encoding are exposed through different
backends, depending on the hardware you are running. These are detected at
runtime, and are all 32 bit libraries also on 64 bit systems, as the client is
32 bit only.
-+------------------+------------------+-----------------------+
-| Video Driver | Hardware API | Library |
-+------------------+------------------+-----------------------+
-| Intel (intel) | Decoding: VA-API | libva.so.1 |
-| Nvidia (nvidia) | Decoding: VDPAU | libvdpau.so.1 |
-| AMD (radeon) | Decoding: VDPAU | libvdpau.so.1 |
-| Nvidia (nouveau) | Decoding: VDPAU | libvdpau.so.1 |
-| Nvidia (nvidia) | Encoding: NVENC | libnvidia-encode.so.1 |
-| Intel (intel) | Encoding: VA-API | libva.so.1 |
-+------------------+------------------+-----------------------+
-
-In-Home streaming configuration
++------------------+------------------+-------------------------+
+| Video Driver | Hardware API | Library |
++------------------+------------------+-------------------------+
+| Intel (intel) | Decoding: VA-API | libva.so.1 / libva.so.2 |
+| Nvidia (nvidia) | Decoding: VDPAU | libvdpau.so.1 |
+| AMD (radeon) | Decoding: VDPAU | libvdpau.so.1 |
+| Nvidia (nouveau) | Decoding: VDPAU | libvdpau.so.1 |
+| Nvidia (nvidia) | Encoding: NVENC | libnvidia-encode.so.1 |
+| Intel (intel) | Encoding: VA-API | libva.so.1 / libva.so.2 |
++------------------+------------------+-------------------------+
+
+Steam Remote Play configuration
===============================
-Valve has supported In-Home streaming (both as a server and as a client) in
-Linux for quite some time. According to the documentation, streaming uses UDP
-ports 27031 to 27036 and TCP ports 27036 and 27037.
+Valve has supported Steam Remote Play (both as a server and as a client) in
+Linux for quite some time. According to the documentation, streaming in the same
+network segment uses UDP ports 27031 to 27036 and TCP ports 27036 and 27037.
-The package includes the required service definitions for FirewallD. If you have
-installed a default desktop, FirewallD should be your firewall solution. To make
-sure that Steam can listen on the required ports through your firewall software,
-execute the following commands as root.
+If you have installed a default desktop, FirewallD should be your firewall
+solution. To make sure that Steam can listen on the required ports through your
+firewall software, execute the following commands as root.
-You should then be able to see the word “steam” by running:
+You should be able to see the word “steam” by running:
# firewall-cmd --get-services | grep steam
@@ -67,38 +66,42 @@ Now start up two Steam clients with your user on the same network, and you
should see games installed on both systems as available for playing in both
Steam clients.
+For Steam Remote Play outside of your network, there is no need to open any
+additional inbound ports.
+
Joysticks, keyboards and game pads
==================================
The package contains the UDEV rules for the following devices:
-- Valve USB devices
-- Steam Controller udev write access
-- Valve HID devices over USB hidraw
-- Valve HID devices over bluetooth hidraw
-- DualShock 4 over USB hidraw
-- DualShock 4 wireless adapter over USB hidraw
-- DualShock 4 Slim over USB hidraw
+- Armor Armor 3 Pad PS4
- DualShock 4 over bluetooth hidraw
+- DualShock 4 over USB hidraw
- DualShock 4 Slim over bluetooth hidraw
-- Nintendo Switch Pro Controller over USB hidraw
-- Nintendo Switch Pro Controller over bluetooth hidraw
-- Nacon PS4 Revolution Pro Controller
-- Razer Raiju PS4 Controller
-- Razer Panthera Arcade Stick
-- Mad Catz - Street Fighter V Arcade FightPad PRO
-- Mad Catz - Street Fighter V Arcade FightStick TE S+
+- DualShock 4 Slim over USB hidraw
+- DualShock 4 wireless adapter over USB hidraw
- EMiO Elite Controller for PS4
-- HORI RAP4
- HORIPAD 4 FPS
- HORIPAD 4 FPS Plus
-- Armor Armor 3 Pad PS4
+- HORI RAP4
+- Mad Catz - Street Fighter V Arcade FightPad PRO
+- Mad Catz - Street Fighter V Arcade FightStick TE S+
+- Nacon PS4 Revolution Pro Controller
+- Nintendo Switch Pro Controller over bluetooth hidraw
+- Nintendo Switch Pro Controller over USB hidraw
+- Razer Panthera Arcade Stick
+- Razer Raiju PS4 Controller
+- Steam Controller udev write access
- STRIKEPAD PS4 Grip Add-on
+- Valve HID devices over bluetooth hidraw
+- Valve HID devices over USB hidraw
+- Valve USB devices
+- ZeroPlus P4 (hitbox)
Additional support for Nvidia devices (including mouse workaround for early
devices):
-- Nvidia Shield Portable (2013) for In-Home Streaming only
+- Nvidia Shield Portable (2013) for Steam Remote Play only
- Nvidia Shield Controller (2015) over USB hidraw
- Nvidia Shield Controller (2017) over bluetooth hidraw
diff --git a/steam.csh b/steam.csh
index 35dfd6f..ddf755e 100644
--- a/steam.csh
+++ b/steam.csh
@@ -7,3 +7,8 @@
# Unify close-to-tray behavior with other platforms. If using a distribution
# that doesn't have proper compatible tray support set variable at 0.
setenv STEAM_FRAME_FORCE_CLOSE 1
+
+# Do not minimize main Steam window after losing focus (i.e. exiting a game in
+# Steam Remote Play.
+# https://github.com/ValveSoftware/steam-for-linux/issues/4611
+setenv SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS 0
diff --git a/steam.sh b/steam.sh
index 3c1c645..8d8ac90 100644
--- a/steam.sh
+++ b/steam.sh
@@ -7,3 +7,8 @@
# Unify close-to-tray behavior with other platforms. If using a distribution
# that doesn't have proper compatible tray support set variable at 0.
STEAM_FRAME_FORCE_CLOSE=1
+
+# Do not minimize main Steam window after losing focus (i.e. exiting a game in
+# Steam Remote Play.
+# https://github.com/ValveSoftware/steam-for-linux/issues/4611
+SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0
diff --git a/steam.spec b/steam.spec
index 9e4ba5a..6bd3603 100644
--- a/steam.spec
+++ b/steam.spec
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.61
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -25,11 +25,10 @@ Source5: README.Fedora
Source6: https://raw.githubusercontent.com/denilsonsa/udev-joystick-blacklist/mast...
# Configure limits in systemd < 240
-Source7: 01-steam.conf
+Source7: 01-steam.conf
-# Remove temporary leftover files after run (fixes multiuser):
-# https://github.com/ValveSoftware/steam-for-linux/issues/3570
-Patch0: %{name}-3570.patch
+# Updated UDEV rules
+Patch0: https://github.com/ValveSoftware/steam-devices/commit/00aa8483cd243cbea9c...
BuildRequires: desktop-file-utils
BuildRequires: systemd
@@ -105,8 +104,9 @@ Requires: alsa-plugins-pulseaudio%{?_isa}
# Game performance is increased with gamemode (for games that support it)
%if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: gamemode
-Recommends: gamemode%{?_isa}
+Requires: gamemode
+Requires: gamemode%{?_isa}
+# Recommends: gnome-shell-extension-gamemode
%endif
Provides: steam-noruntime = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -149,8 +149,8 @@ install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_metainfodir}
install -p -m 0644 %{SOURCE4} %{buildroot}%{_metainfodir}/
-# Systemd configuration for systemd < 240
-%if 0%{?fedora} && 0%{?fedora} < 30
+# Since systemd 240 we don't need to raise NOFILE limit
+%if 0%{?rhel} >= 7
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
@@ -158,8 +158,6 @@ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
%endif
%post
-%if 0%{?fedora} && 0%{?fedora} < 29 || 0%{?rhel} == 7
-%endif
%if 0%{?rhel} == 7
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
@@ -191,8 +189,8 @@ fi
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_udevrulesdir}/*
-# Since F30 (systemd 240) we don't need to raise NOFILE limit
-%if 0%{?fedora} && 0%{?fedora} < 30
+# Since systemd 240 we don't need to raise NOFILE limit
+%if 0%{?rhel} >= 7
%{_prefix}/lib/systemd/system.conf.d/
%{_prefix}/lib/systemd/system.conf.d/01-steam.conf
%{_prefix}/lib/systemd/user.conf.d/
@@ -200,6 +198,14 @@ fi
%endif
%changelog
+* Sun Feb 09 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.61-9
+- Update README.Fedora
+- Require gamemode on Fedora & CentOS/RHEL 8.
+- Adjust distribution conditionals.
+- Make sure you are not left with the desktop when streaming with no option
+ to get back to the Steam client.
+- Update udev rules.
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.0.0.61-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 9 months
[steam/el8] (6 commits) ...Small updates
by Simone Caronni
Summary of changes:
0bc087a... Add boolean requires for nvidia i686 libs (*)
af86599... Revert "Add boolean requires for nvidia i686 libs" (*)
6694c64... Revert last commit (*)
be74c60... bump n-v-r (*)
c378000... - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass (*)
66e072d... Small updates
(*) This commit already existed in another branch; no separate mail sent
4 years, 9 months
[steam/el7] Merge from master
by Simone Caronni
commit d5ee0d25c2c0b45dfadcf641911d6f0100927b28
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 16 10:09:00 2019 +0000
Merge from master
README.Fedora | 81 +++++++++++++++++++++++++++++---------------------------
steam-3570.patch | 10 -------
steam.csh | 5 ++++
steam.sh | 5 ++++
steam.spec | 32 +++++++++++++---------
5 files changed, 71 insertions(+), 62 deletions(-)
---
diff --git a/README.Fedora b/README.Fedora
index e2a0460..5e50a17 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -16,38 +16,37 @@ And launch the client again, it will adjust all the symlinks for folders, saves,
etc. by itself. Even the desktop / system shortcuts for the games work because
they launch Steam (which is in the path) with the appropriate Steam game ID.
-In-Home Streaming (hardware decoding/encoding)
+Steam Remote Play (hardware decoding/encoding)
==============================================
-In-Home Streaming hardware decoding and encoding are exposed through different
+Steam Remote Play hardware decoding and encoding are exposed through different
backends, depending on the hardware you are running. These are detected at
runtime, and are all 32 bit libraries also on 64 bit systems, as the client is
32 bit only.
-+------------------+------------------+-----------------------+
-| Video Driver | Hardware API | Library |
-+------------------+------------------+-----------------------+
-| Intel (intel) | Decoding: VA-API | libva.so.1 |
-| Nvidia (nvidia) | Decoding: VDPAU | libvdpau.so.1 |
-| AMD (radeon) | Decoding: VDPAU | libvdpau.so.1 |
-| Nvidia (nouveau) | Decoding: VDPAU | libvdpau.so.1 |
-| Nvidia (nvidia) | Encoding: NVENC | libnvidia-encode.so.1 |
-| Intel (intel) | Encoding: VA-API | libva.so.1 |
-+------------------+------------------+-----------------------+
-
-In-Home streaming configuration
++------------------+------------------+-------------------------+
+| Video Driver | Hardware API | Library |
++------------------+------------------+-------------------------+
+| Intel (intel) | Decoding: VA-API | libva.so.1 / libva.so.2 |
+| Nvidia (nvidia) | Decoding: VDPAU | libvdpau.so.1 |
+| AMD (radeon) | Decoding: VDPAU | libvdpau.so.1 |
+| Nvidia (nouveau) | Decoding: VDPAU | libvdpau.so.1 |
+| Nvidia (nvidia) | Encoding: NVENC | libnvidia-encode.so.1 |
+| Intel (intel) | Encoding: VA-API | libva.so.1 / libva.so.2 |
++------------------+------------------+-------------------------+
+
+Steam Remote Play configuration
===============================
-Valve has supported In-Home streaming (both as a server and as a client) in
-Linux for quite some time. According to the documentation, streaming uses UDP
-ports 27031 to 27036 and TCP ports 27036 and 27037.
+Valve has supported Steam Remote Play (both as a server and as a client) in
+Linux for quite some time. According to the documentation, streaming in the same
+network segment uses UDP ports 27031 to 27036 and TCP ports 27036 and 27037.
-The package includes the required service definitions for FirewallD. If you have
-installed a default desktop, FirewallD should be your firewall solution. To make
-sure that Steam can listen on the required ports through your firewall software,
-execute the following commands as root.
+If you have installed a default desktop, FirewallD should be your firewall
+solution. To make sure that Steam can listen on the required ports through your
+firewall software, execute the following commands as root.
-You should then be able to see the word “steam” by running:
+You should be able to see the word “steam” by running:
# firewall-cmd --get-services | grep steam
@@ -67,38 +66,42 @@ Now start up two Steam clients with your user on the same network, and you
should see games installed on both systems as available for playing in both
Steam clients.
+For Steam Remote Play outside of your network, there is no need to open any
+additional inbound ports.
+
Joysticks, keyboards and game pads
==================================
The package contains the UDEV rules for the following devices:
-- Valve USB devices
-- Steam Controller udev write access
-- Valve HID devices over USB hidraw
-- Valve HID devices over bluetooth hidraw
-- DualShock 4 over USB hidraw
-- DualShock 4 wireless adapter over USB hidraw
-- DualShock 4 Slim over USB hidraw
+- Armor Armor 3 Pad PS4
- DualShock 4 over bluetooth hidraw
+- DualShock 4 over USB hidraw
- DualShock 4 Slim over bluetooth hidraw
-- Nintendo Switch Pro Controller over USB hidraw
-- Nintendo Switch Pro Controller over bluetooth hidraw
-- Nacon PS4 Revolution Pro Controller
-- Razer Raiju PS4 Controller
-- Razer Panthera Arcade Stick
-- Mad Catz - Street Fighter V Arcade FightPad PRO
-- Mad Catz - Street Fighter V Arcade FightStick TE S+
+- DualShock 4 Slim over USB hidraw
+- DualShock 4 wireless adapter over USB hidraw
- EMiO Elite Controller for PS4
-- HORI RAP4
- HORIPAD 4 FPS
- HORIPAD 4 FPS Plus
-- Armor Armor 3 Pad PS4
+- HORI RAP4
+- Mad Catz - Street Fighter V Arcade FightPad PRO
+- Mad Catz - Street Fighter V Arcade FightStick TE S+
+- Nacon PS4 Revolution Pro Controller
+- Nintendo Switch Pro Controller over bluetooth hidraw
+- Nintendo Switch Pro Controller over USB hidraw
+- Razer Panthera Arcade Stick
+- Razer Raiju PS4 Controller
+- Steam Controller udev write access
- STRIKEPAD PS4 Grip Add-on
+- Valve HID devices over bluetooth hidraw
+- Valve HID devices over USB hidraw
+- Valve USB devices
+- ZeroPlus P4 (hitbox)
Additional support for Nvidia devices (including mouse workaround for early
devices):
-- Nvidia Shield Portable (2013) for In-Home Streaming only
+- Nvidia Shield Portable (2013) for Steam Remote Play only
- Nvidia Shield Controller (2015) over USB hidraw
- Nvidia Shield Controller (2017) over bluetooth hidraw
diff --git a/steam.csh b/steam.csh
index 35dfd6f..ddf755e 100644
--- a/steam.csh
+++ b/steam.csh
@@ -7,3 +7,8 @@
# Unify close-to-tray behavior with other platforms. If using a distribution
# that doesn't have proper compatible tray support set variable at 0.
setenv STEAM_FRAME_FORCE_CLOSE 1
+
+# Do not minimize main Steam window after losing focus (i.e. exiting a game in
+# Steam Remote Play.
+# https://github.com/ValveSoftware/steam-for-linux/issues/4611
+setenv SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS 0
diff --git a/steam.sh b/steam.sh
index 3c1c645..8d8ac90 100644
--- a/steam.sh
+++ b/steam.sh
@@ -7,3 +7,8 @@
# Unify close-to-tray behavior with other platforms. If using a distribution
# that doesn't have proper compatible tray support set variable at 0.
STEAM_FRAME_FORCE_CLOSE=1
+
+# Do not minimize main Steam window after losing focus (i.e. exiting a game in
+# Steam Remote Play.
+# https://github.com/ValveSoftware/steam-for-linux/issues/4611
+SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0
diff --git a/steam.spec b/steam.spec
index c7169b6..1d521ad 100644
--- a/steam.spec
+++ b/steam.spec
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.61
-Release: 5%{?dist}
+Release: 9%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -25,11 +25,10 @@ Source5: README.Fedora
Source6: https://raw.githubusercontent.com/denilsonsa/udev-joystick-blacklist/mast...
# Configure limits in systemd < 240
-Source7: 01-steam.conf
+Source7: 01-steam.conf
-# Remove temporary leftover files after run (fixes multiuser):
-# https://github.com/ValveSoftware/steam-for-linux/issues/3570
-Patch0: %{name}-3570.patch
+# Updated UDEV rules
+Patch0: https://github.com/ValveSoftware/steam-devices/commit/00aa8483cd243cbea9c...
BuildRequires: desktop-file-utils
BuildRequires: systemd
@@ -105,8 +104,9 @@ Requires: alsa-plugins-pulseaudio%{?_isa}
# Game performance is increased with gamemode (for games that support it)
%if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: gamemode
-Recommends: gamemode%{?_isa}
+Requires: gamemode
+Requires: gamemode%{?_isa}
+# Recommends: gnome-shell-extension-gamemode
%endif
Provides: steam-noruntime = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -149,8 +149,8 @@ install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_metainfodir}
install -p -m 0644 %{SOURCE4} %{buildroot}%{_metainfodir}/
-# Systemd configuration for systemd < 240
-%if 0%{?fedora} && 0%{?fedora} < 30
+# Since systemd 240 we don't need to raise NOFILE limit
+%if 0%{?rhel} >= 7
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
@@ -158,8 +158,6 @@ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
%endif
%post
-%if 0%{?fedora} && 0%{?fedora} < 29 || 0%{?rhel} == 7
-%endif
%if 0%{?rhel} == 7
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
@@ -191,8 +189,8 @@ fi
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_udevrulesdir}/*
-# Since F30 (systemd 240) we don't need to raise NOFILE limit
-%if 0%{?fedora} && 0%{?fedora} < 30
+# Since systemd 240 we don't need to raise NOFILE limit
+%if 0%{?rhel} >= 7
%{_prefix}/lib/systemd/system.conf.d/
%{_prefix}/lib/systemd/system.conf.d/01-steam.conf
%{_prefix}/lib/systemd/user.conf.d/
@@ -200,6 +198,14 @@ fi
%endif
%changelog
+* Sun Feb 09 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.61-9
+- Update README.Fedora
+- Require gamemode on Fedora & CentOS/RHEL 8.
+- Adjust distribution conditionals.
+- Make sure you are not left with the desktop when streaming with no option
+ to get back to the Steam client.
+- Update udev rules.
+
* Sat Nov 02 2019 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.61-5
- Do not remove bundled libstdc++ (#5421).
4 years, 9 months
[xv] Fix FTBFS with GCC 10
by Paul Howarth
commit 20505a5bf136757e56a5b540f6d9a182ae53952f
Author: Paul Howarth <paul(a)city-fan.org>
Date: Sun Feb 9 14:42:34 2020 +0000
Fix FTBFS with GCC 10
xv-3.10a-gcc10.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
xv.spec | 49 ++++++++++++++++++++++++---------------------
2 files changed, 83 insertions(+), 22 deletions(-)
---
diff --git a/xv-3.10a-gcc10.patch b/xv-3.10a-gcc10.patch
new file mode 100644
index 0000000..af9301c
--- /dev/null
+++ b/xv-3.10a-gcc10.patch
@@ -0,0 +1,56 @@
+--- xvalg.c
++++ xvalg.c
+@@ -54,8 +54,6 @@ int start24bitAlg PARM((byte **
+ void end24bitAlg PARM((byte *, byte *));
+ void printUTime PARM((const char *));
+
+-byte *origPic = (byte *) NULL;
+-int origPicType;
+ static byte origrmap[256], origgmap[256], origbmap[256];
+
+
+--- xv.c
++++ xv.c
+@@ -214,7 +214,7 @@ int main(argc, argv)
+ visualstr = monofontname = flistName = NULL;
+ winTitle = NULL;
+
+- pic = egampic = epic = cpic = NULL;
++ pic = egampic = epic = cpic = origPic = NULL;
+ theImage = NULL;
+
+ picComments = (char *) NULL;
+--- xv.h
++++ xv.h
+@@ -1183,6 +1183,8 @@ WHERE int picType;
+ WHERE char *picComments; /* text comments on current pic */
+ WHERE byte *picExifInfo; /* image info from digicam */
+ WHERE int picExifInfoSize; /* size of image info */
++WHERE byte *origPic; /* ptr to original picture */
++WHERE int origPicType; /* type of original picture */
+
+ #ifdef TV_L10N
+ WHERE int xlocale; /* true if Xlib supports locale */
+--- xvimage.c
++++ xvimage.c
+@@ -348,9 +348,6 @@ int w,h;
+ CreateXImage();
+ }
+
+-byte *origPic;
+-int origPicType;
+-
+ /********************************************/
+ void GenerateCpic()
+ {
+--- xvmask.c
++++ xvmask.c
+@@ -42,8 +42,6 @@ void end24bitAlg PARM ((byte *, byte *
+ void saveOrigPic PARM ((void));
+ void printUTime PARM ((char *));
+
+-byte *origPic;
+-
+ #undef TIMING_TEST
+
+ #ifdef TIMING_TEST
diff --git a/xv.spec b/xv.spec
index dfc67a9..4250fe8 100644
--- a/xv.spec
+++ b/xv.spec
@@ -1,10 +1,9 @@
-%define _legacy_common_support 1
%global vprog 3.10a
%global vjumbo 20070520
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 33%{?dist}
+Release: 34%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -36,6 +35,7 @@ Patch8: xv-3.10a-format.patch
Patch9: xv-3.10a-png-itxt.patch
Patch10: xv-3.10a-smooth-fix2.patch
Patch11: xv-3.10a-signal.patch
+Patch12: xv-3.10a-gcc10.patch
BuildRequires: gcc
BuildRequires: libtiff-devel
@@ -124,8 +124,8 @@ of the various image file formats supported.
%setup -q -n %{name}-%{vprog} -b 1 -a 5 -a 6
# Apply 20070520 jumbo enhancement patch, bundled with %%{SOURCE1}
-%{__patch} -p1 < ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
-%{__rm} ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
+patch -p1 < ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
+rm ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
# Fix compiler options, install directories; enable JPEG 2000 support
%patch0 -p1
@@ -163,42 +163,44 @@ of the various image file formats supported.
# Hopefully fix rfbz#3044
%patch11 -p0
+# Fix FTBFS with GCC 10
+%patch12 -p0
# Include permission to distribute
-%{__install} -m 0644 -p %{SOURCE2} .
+install -m 0644 -p %{SOURCE2} .
# Recode docs as UTF-8
for F in README.jumbo copyright.h fi/man1/xv.1; do
- iconv -f iso88591 -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
+ iconv -f iso88591 -t utf8 ${F} -o ${F}.utf8 && mv -f ${F}.utf8 ${F}
done
for F in pl/man1/xvpictoppm.1; do
- iconv -f iso-8859-2 -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
+ iconv -f iso-8859-2 -t utf8 ${F} -o ${F}.utf8 && mv -f ${F}.utf8 ${F}
done
for F in 00_README CPMASK; do
- iconv -f EUC-JP -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
+ iconv -f EUC-JP -t utf8 ${F} -o ${F}.utf8 && mv -f ${F}.utf8 ${F}
done
# Reorganize docs
#
# Note: Man pages for p?m file formats would conflict with netpbm-progs if installed under %%{_mandir}
-%{__mv} 00_README README.FLmask
-%{__mv} docs/README README.docs
-%{__mkdir} docs/{formats,manuals}/
-%{__mv} docs/{bmp.doc,epsf.ps,gif*,p[bgp]m.5,xpm.ps} docs/formats/
-%{__mv} docs/{xvdocs.{ps,pdf},xvtitle.ps} docs/manuals/
+mv 00_README README.FLmask
+mv docs/README README.docs
+mkdir docs/{formats,manuals}/
+mv docs/{bmp.doc,epsf.ps,gif*,p[bgp]m.5,xpm.ps} docs/formats/
+mv docs/{xvdocs.{ps,pdf},xvtitle.ps} docs/manuals/
# HTML manual
-%{__mv} -f xvman310a docs/manuals/html
+mv -f xvman310a docs/manuals/html
# Fix line endings
for doc in docs/manuals/xv*.ps; do
- %{__sed} -e 's/\r$//' ${doc} > ${doc}.unix
+ sed -e 's/\r$//' ${doc} > ${doc}.unix
touch -r ${doc} ${doc}.unix
- %{__mv} -f ${doc}.unix ${doc}
+ mv -f ${doc}.unix ${doc}
done
# Fix directory location of X libs
-%{__sed} -i -e 's@-L/usr/X11R6/lib[[:space:]]@-L%{_libdir} -lXt @' Makefile
+sed -i -e 's@-L/usr/X11R6/lib[[:space:]]@-L%{_libdir} -lXt @' Makefile
%build
%{make_build}
@@ -210,17 +212,17 @@ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE3}
-%{__install} -D -p -m 0644 %{SOURCE4} \
+install -D -p -m 0644 %{SOURCE4} \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
# Non-English man pages
-%{__install} -D -p -m 0644 fi/man1/xv.1 \
+install -D -p -m 0644 fi/man1/xv.1 \
%{buildroot}%{_mandir}/fi/man1/xv.1
-%{__install} -D -p -m 0644 pl/man1/xvpictoppm.1 \
+install -D -p -m 0644 pl/man1/xvpictoppm.1 \
%{buildroot}%{_mandir}/pl/man1/xvpictoppm.1
# Populate the docs directory
-%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{vprog}/
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{vprog}/
for doc in \
BUGS \
CHANGELOG \
@@ -238,7 +240,7 @@ for doc in \
docs/formats/ \
docs/manuals/
do
- %{__cp} -a ${doc} %{buildroot}%{_docdir}/%{name}-%{vprog}/
+ cp -a ${doc} %{buildroot}%{_docdir}/%{name}-%{vprog}/
done
@@ -276,6 +278,9 @@ done
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Sun Feb 9 2020 Paul Howarth <paul(a)city-fan.org> - 3.10a.jumbopatch.20070520-34
+- Fix FTBFS with GCC 10
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.10a.jumbopatch.20070520-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 9 months
[VirtualBox] Fix build
by Sérgio M. Basto
commit d585bc827e939ff9b671a7c42164a0e7c8c698a8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Feb 9 00:46:10 2020 +0000
Fix build
Makefile.kmk_hack.patch | 28 ++++++++++++++++++++++++++++
VirtualBox.spec | 2 ++
2 files changed, 30 insertions(+)
---
diff --git a/Makefile.kmk_hack.patch b/Makefile.kmk_hack.patch
new file mode 100644
index 0000000..2457d19
--- /dev/null
+++ b/Makefile.kmk_hack.patch
@@ -0,0 +1,28 @@
+--- ./Makefile.kmk.orig 2020-02-05 00:18:15.751562458 +0000
++++ ./Makefile.kmk 2020-02-05 01:47:17.825333439 +0000
+@@ -169,15 +169,6 @@ ifeq ($(KBUILD_TARGET),darwin)
+ Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
+ Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
+ else # win x11
+- if1of ($(KBUILD_TARGET), linux solaris)
+- ifndef VBOX_ONLY_BUILD
+- ifneq ($(VBOX_GCC_VERSION_CXX),)
+- ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),)
+- $(error gcc >= 4.4 required when compiling against Qt5!)
+- endif
+- endif
+- endif
+- endif
+ if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
+ include $(KBUILD_PATH)/units/qt5.kmk
+ ifeq ($(KBUILD_TARGET),win)
+--- ./src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-02-08 23:53:19.747326051 +0000
++++ ./src/VBox/Devices/PC/ipxe/Makefile.kmk 2020-02-08 23:54:17.038644318 +0000
+@@ -111,6 +111,7 @@ endif
+ TEMPLATE_iPxe_LNK_DEPS = $(VBOX_PATH_IPXE_SRC)/src/arch/i386/scripts/i386.lds
+ TEMPLATE_iPxe_CFLAGS = \
+ -fno-pie \
++ -fcommon \
+ -ffreestanding \
+ -ffunction-sections \
+ -march=i386 \
diff --git a/VirtualBox.spec b/VirtualBox.spec
index b9f4d66..9bcd12e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -90,6 +90,7 @@ Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
# from OpenSuse
Patch70: vbox-python-detection.diff
+Patch80: Makefile.kmk_hack.patch
BuildRequires: kBuild >= 0.1.9998.r3093
BuildRequires: SDL-devel
@@ -331,6 +332,7 @@ rm -r src/libs/zlib-1.2.*/
%patch60 -p1 -b .xclient
%patch61 -p1 -b .automount
%patch70 -p1 -b .python-detection
+%patch80 -p1 -b .Makefile.kmk_hack.patch
%build
./configure --disable-kmods \
4 years, 9 months
[vlc] Rebuild for new libplacebo version
by Leigh Scott
commit 49215ee5f6f29853d8624f8019050482ae72d8a4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 20:13:34 2020 +0000
Rebuild for new libplacebo version
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 9899c2e..03c7e2d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -54,7 +54,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.9
-Release: 29%{?dist}
+Release: 30%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -563,6 +563,9 @@ fi || :
%changelog
+* Sat Feb 08 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.9-30
+- Rebuild for new libplacebo version
+
* Sat Feb 01 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 1:3.0.9-29
- rebuilt
4 years, 9 months
[mpv] Rebuild for new libplacebo version
by Leigh Scott
commit 48b25a1f851f2ede69c36b9d150cfade7c9355b9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 20:12:29 2020 +0000
Rebuild for new libplacebo version
mpv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mpv.spec b/mpv.spec
index 53d10c4..a916212 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.32.0
-Release: 2%{?gitrelease}%{?dist}
+Release: 3%{?gitrelease}%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://mpv.io/
@@ -180,6 +180,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Sat Feb 08 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.32.0-3
+- Rebuild for new libplacebo version
+
* Sun Jan 26 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.32.0-2
- Drop libarchive support for f30 and el8, supporting 0.31.0 for the
next decade isn't an option
4 years, 9 months
[xpra-codecs-freeworld] Release 3.0.6
by Antonio
commit b8e918dad6c1d9b464b498da5f061c69240fae11
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Feb 8 19:21:45 2020 +0100
Release 3.0.6
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff053ee..0011106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ xpra-0.16.3.tar.xz
/xpra-3.0.2.tar.xz
/xpra-3.0.3.tar.xz
/xpra-3.0.5.tar.xz
+/xpra-3.0.6.tar.xz
diff --git a/sources b/sources
index f6d5780..81b0cde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-3.0.5.tar.xz) = 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
+SHA512 (xpra-3.0.6.tar.xz) = e3bd7a3e32e3f974494b10cc3607a6284c3d7f25ec384a1910d40bbf5adbcf6c0c129e6f877b2fbd37460fa0fd916ad011c3b49d59aa8e03b97447269407f062
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 3056266..a512347 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -25,8 +25,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
@@ -125,6 +125,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Sat Feb 08 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.0.6-1
+- Release 3.0.6
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 9 months
[zoneminder/el7: 2/2] Merge branch 'master' into el7
by Andrew Bauer
commit 40c5d7eff6c405ed312d29db247f222fd6471ec2
Merge: 3070621 76c1b33
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Feb 8 11:19:55 2020 -0600
Merge branch 'master' into el7
.gitignore | 1 +
sources | 3 +--
zoneminder.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
4 years, 9 months
