[d1x] Update to upstream d1x-rebirth stable-0.60.x branch a.d. 18-12-2018 Fixes d2x-rebirth crashing when
by jwrdegoede
commit 301b4724102e232884c2eb08325f845e2c7cd555
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Dec 18 09:15:43 2018 +0100
Update to upstream d1x-rebirth stable-0.60.x branch a.d. 18-12-2018
Fixes d2x-rebirth crashing when the descent 2 mvl (movie) files are present
.gitignore | 1 +
d1x.spec | 18 ++++++++++++------
sources | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18bd213..15662a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ d1swdf.tar.gz
d1x-rebirth_v0.58.1-src.tar.gz
/d2shar10.tar.gz
/stable-0.60.x.zip
+/dxx-rebirth-af25483.tar.gz
diff --git a/d1x.spec b/d1x.spec
index 3c1d1cc..5d0568f 100644
--- a/d1x.spec
+++ b/d1x.spec
@@ -1,14 +1,16 @@
+# Upstream is not really good in doing timely releases, so we use
+# a git snapshot of the dxx-rebirth stable-0.60.x branch
%global rebirth_version 0.60
+%global snapshotdate 20181218
+%global commit af25483d01e444553b70cf70c2c7fb8403875f71
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
Summary: Descent 1 game and shareware data files (d1x-rebirth version)
Name: d1x
Version: 1.43
-Release: 19.rebirth_v%{rebirth_version}%{?dist}
+Release: 20.rebirth_v%{rebirth_version}.%{snapshotdate}git%{shortcommit}%{?dist}
License: non-commercial
-# stable-0.60.x branch snapshot downloaded from
-# https://github.com/dxx-rebirth/dxx-rebirth/archive/stable-0.60.x.zip
-# on 16-12-2018, git hash of HEAD b43a351aa90d125a034e68e8b5762ea2dd8bcb93
-Source0: stable-0.60.x.zip
+Source0: https://github.com/dxx-rebirth/dxx-rebirth/archive/%{commit}/dxx-rebirth-...
Source1: d1x-rebirth.sh
Source2: d2x-rebirth.sh
Source3: d1swdf.tar.gz
@@ -59,7 +61,7 @@ robots-h.mvl files to the dir.
%prep
-%setup -q -n dxx-rebirth-stable-%{rebirth_version}.x -a 3 -a 4
+%setup -q -n dxx-rebirth-%{commit} -a 3 -a 4
# Fixup encoding and CTRL+Z at the end of the orderfrm.txt files
iconv -f CP850 -t UTF-8 d1shar/ORDERFRM.TXT | head -n-3 > ORDERFRM.TXT
touch -r d1shar/ORDERFRM.TXT ORDERFRM.TXT
@@ -147,6 +149,10 @@ appstream-util validate-relax --nonet \
%changelog
+* Tue Dec 18 2018 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.43-20.rebirth_v0.60.20181218gitaf25483
+- Update to upstream d1x-rebirth stable-0.60.x branch a.d. 18-12-2018
+- Fixes d2x-rebirth crashing when the descent 2 mvl (movie) files are present
+
* Sun Dec 16 2018 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.43-19.rebirth_v0.60
- Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026)
- Merge d1x-shareware package into the main-package so that installing d1x
diff --git a/sources b/sources
index fad4e76..e6b950f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
8112d6127a7a81a36735f5a9c3175ec2 d1swdf.tar.gz
1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz
-b94994c64922d152a3f3a317184c061e stable-0.60.x.zip
+9baf66ac3dedfc234a77419d5dcfa253 dxx-rebirth-af25483.tar.gz
5 years, 11 months
[raspberrypi-vc] Build with BUILD_SHARED_LIBS OFF
by Andrew Bauer
commit d95c80393828671260210038b933887904f64481
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Mon Dec 17 19:09:02 2018 -0600
Build with BUILD_SHARED_LIBS OFF
raspberrypi-vc.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index 52558fe..a8b475b 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -3,7 +3,7 @@
Name: raspberrypi-vc
Version: 20181212
-Release: 1.git%{commit_short}%{?dist}
+Release: 2.git%{commit_short}%{?dist}
Summary: VideoCore GPU libraries, utilities and demos for Raspberry Pi
License: BSD
URL: https://github.com/raspberrypi
@@ -79,6 +79,8 @@ Raspberry Pi.
%build
mkdir build
pushd build
+# Must set BUILD_SHARED_LIBS=OFF
+# See for details: https://github.com/raspberrypi/userland/pull/333
%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DVMCS_INSTALL_PREFIX=%{_prefix} \
@@ -254,6 +256,9 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%changelog
+* Mon Dec 17 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 20181108-2.gitd574b51
+- Build with BUILD_SHARED_LIBS OFF
+
* Sat Nov 10 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 20181108-1.gitd574b51
- Refactor for RPM Fusion
- See RFBZ 5074
5 years, 11 months
[d1x] Add missing BuildRequires: libpng-devel
by jwrdegoede
commit af1aba9fd69155f556ecdf3510f2408a7b63020a
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Dec 17 22:27:30 2018 +0100
Add missing BuildRequires: libpng-devel
d1x.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/d1x.spec b/d1x.spec
index af8f067..3c1d1cc 100644
--- a/d1x.spec
+++ b/d1x.spec
@@ -16,7 +16,7 @@ Source4: https://www.icculus.org/d2x/data/d2shar10.tar.gz
Source5: d1x-rebirth.appdata.xml
Source6: d2x-rebirth.appdata.xml
URL: https://www.dxx-rebirth.com/
-BuildRequires: gcc gcc-c++
+BuildRequires: gcc gcc-c++ libpng-devel
BuildRequires: SDL-devel SDL_mixer-devel mesa-libGL-devel mesa-libGLU-devel
BuildRequires: physfs-devel scons desktop-file-utils dos2unix
BuildRequires: ImageMagick libappstream-glib
5 years, 11 months
[d1x] Add missing BuildRequires: gcc gcc-c++
by jwrdegoede
commit bc388fc7ae4dfc1875a4c0f4fef8ff01c93d6b94
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Dec 17 22:17:54 2018 +0100
Add missing BuildRequires: gcc gcc-c++
d1x.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/d1x.spec b/d1x.spec
index c41d639..af8f067 100644
--- a/d1x.spec
+++ b/d1x.spec
@@ -16,6 +16,7 @@ Source4: https://www.icculus.org/d2x/data/d2shar10.tar.gz
Source5: d1x-rebirth.appdata.xml
Source6: d2x-rebirth.appdata.xml
URL: https://www.dxx-rebirth.com/
+BuildRequires: gcc gcc-c++
BuildRequires: SDL-devel SDL_mixer-devel mesa-libGL-devel mesa-libGLU-devel
BuildRequires: physfs-devel scons desktop-file-utils dos2unix
BuildRequires: ImageMagick libappstream-glib
5 years, 11 months
[d1x] Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026) Merge d1x-shareware pac
by jwrdegoede
commit fd87998823c873e21aa2c2fc624fdd33779d1aa1
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Dec 17 21:59:40 2018 +0100
Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026)
Merge d1x-shareware package into the main-package so that installing d1x
from e.g. gnome-software always results in a functional game
Add appdata
New upstream includes d2x, add a d2x sub-package, including d2x demo levels
Trim changelog
.gitignore | 2 +
d1x-rebirth.appdata.xml | 33 +++++++
d1x-rebirth.sh | 14 ++-
d1x.spec | 235 ++++++++++++++++++++++--------------------------
d2x-rebirth.appdata.xml | 40 +++++++++
d2x-rebirth.sh | 34 +++++++
sources | 3 +-
7 files changed, 221 insertions(+), 140 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66be814..18bd213 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
d1swdf.tar.gz
d1x-rebirth_v0.58.1-src.tar.gz
+/d2shar10.tar.gz
+/stable-0.60.x.zip
diff --git a/d1x-rebirth.appdata.xml b/d1x-rebirth.appdata.xml
new file mode 100644
index 0000000..e2d78d7
--- /dev/null
+++ b/d1x-rebirth.appdata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+ <id>d1x-rebirth.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>Descent</name>
+ <summary>3D spacecraft-based first person shooter</summary>
+ <description>
+ <p>
+ Descent is a classic first person shooter. You control a space-ship which
+ is flying through a mine where the AI controlled robots have gone rogue.
+ Your task is to fight the robots and rescue the human workers.
+ </p>
+ <p>
+ Descent is the first game featuring a full 3D environment. In Descent
+ you control your space-ship with six degrees of freedom movement.
+ </p>
+ <p>
+ This version of Descent comes with the shareware version of the game.
+ If you want to play the full (registered/commercial) version of the game,
+ place the descent.hog and descent.pig data-files from your registered
+ Descent version in /usr/share/d1x/full; or in $HOME/.d1x-rebirth.
+ </p>
+ </description>
+ <url type="homepage">https://www.dxx-rebirth.com/</url>
+ <screenshots>
+ <screenshot type="default">https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_screenshots/d1...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_screenshots/d1...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_screenshots/d1...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_screenshots/d1...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_screenshots/d1...</screenshot>
+ </screenshots>
+ <updatecontact>j.w.r.degoede_at_gmail.com</updatecontact>
+</component>
diff --git a/d1x-rebirth.sh b/d1x-rebirth.sh
index bb8fc57..7cbd346 100644
--- a/d1x-rebirth.sh
+++ b/d1x-rebirth.sh
@@ -8,15 +8,11 @@ else
D1X=/usr/bin/d1x-rebirth-sdl
fi
-if [ -f /usr/share/d1x/full/descent.hog -a \
- -f /usr/share/d1x/full/descent.pig ]; then
+if [ '(' -f /usr/share/d1x/full/descent.hog -a \
+ -f /usr/share/d1x/full/descent.pig ')' -o \
+ '(' -f $HOME/.d1x-rebirth/descent.hog -a \
+ -f $HOME/.d1x-rebirth/descent.pig ')' ]; then
exec $D1X "$@"
-elif [ -f /usr/share/d1x/d1shar/descent.hog -a \
- -f /usr/share/d1x/d1shar/descent.pig ]; then
- exec $D1X -hogdir /usr/share/d1x/d1shar/ "$@"
else
- zenity --error --text="No Descent 1 data files found, either place the \
-full (registered/commercial) version data-files (descent.hog and descent.pig) \
-in /usr/share/d1x/full/descent.pig; or install the d1x-shareware package."
- exit 1
+ exec $D1X -hogdir /usr/share/d1x/d1shar/ "$@"
fi
diff --git a/d1x.spec b/d1x.spec
index 1d61715..c41d639 100644
--- a/d1x.spec
+++ b/d1x.spec
@@ -1,105 +1,159 @@
-%global rebirth_version 0.58.1
+%global rebirth_version 0.60
-Summary: Descent 1 game engine (d1x-rebirth version)
+Summary: Descent 1 game and shareware data files (d1x-rebirth version)
Name: d1x
Version: 1.43
-Release: 18.rebirth_v%{rebirth_version}%{?dist}
+Release: 19.rebirth_v%{rebirth_version}%{?dist}
License: non-commercial
-Group: Amusements/Games
-Source0: http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v%{rebirth_version}-s...
+# stable-0.60.x branch snapshot downloaded from
+# https://github.com/dxx-rebirth/dxx-rebirth/archive/stable-0.60.x.zip
+# on 16-12-2018, git hash of HEAD b43a351aa90d125a034e68e8b5762ea2dd8bcb93
+Source0: stable-0.60.x.zip
Source1: d1x-rebirth.sh
-Source2: d1swdf.tar.gz
-URL: http://www.dxx-rebirth.com/
+Source2: d2x-rebirth.sh
+Source3: d1swdf.tar.gz
+Source4: https://www.icculus.org/d2x/data/d2shar10.tar.gz
+Source5: d1x-rebirth.appdata.xml
+Source6: d2x-rebirth.appdata.xml
+URL: https://www.dxx-rebirth.com/
BuildRequires: SDL-devel SDL_mixer-devel mesa-libGL-devel mesa-libGLU-devel
BuildRequires: physfs-devel scons desktop-file-utils dos2unix
+BuildRequires: ImageMagick libappstream-glib
Requires: opengl-games-utils >= 0.2
Requires: hicolor-icon-theme
Provides: %{name}-full = %{version}-%{release}
Obsoletes: %{name}-full < %{version}-%{release}
+Provides: %{name}-shareware = %{version}-%{release}
+Obsoletes: %{name}-shareware < %{version}-%{release}
%description
D1X is a modification of the Descent 1 source that was released by
Parallax. It's mostly compatible with the Descent 1 v1.5, both in
multiplayer and on the local machine.
-To play Descent1 you need to either need the full (registered/commercial)
-version of the game and place the full version data-files in
-%{_datadir}/%{name}/full; or install the d1x-shareware package.
+This package comes with the shareware version of the game. If you want to
+play the full (registered/commercial) version of the game, place the
+descent.hog and descent.pig data-files from your registered descent version
+in %{_datadir}/d1x/full; or in $HOME/.d1x-rebirth.
-%package shareware
-Summary: Shareware version of Descent 1
-Group: Amusements/Games
-Requires: %{name} = %{version}-%{release}
+%package -n d2x
+Summary: Descent 2 game and shareware data files (d2x-rebirth version)
+Requires: opengl-games-utils >= 0.2
+Requires: hicolor-icon-theme
-%description shareware
-D1X is a modification of the Descent 1 source that was released by
-Parallax. It's mostly compatible with the Descent 1 v1.5, both in
-multiplayer and on the local machine.
+%description -n d2x
+D2X is a modification of the Descent 2 source that was released by Parallax.
+It's mostly compatible with the original Descent 2, both in multiplayer and
+on the local machine.
+
+This package comes with the shareware version of the game. If you want to
+play the full (registered/commercial) version of the game, place the
+alien1.pig, alien2.pig, fire.pig, groupa.pig, ice.pig, water.pig, descent2.hog,
+descent2.ham, descent2.s11 and descent2.s22 data-files from your registered
+descent version in %{_datadir}/d2x/full; or in $HOME/.d2x-rebirth.
-This package contains the shareware version of the game.
+If you want to have the movies also add the intro-h.mvl, other-h.mvl and
+robots-h.mvl files to the dir.
%prep
-%setup -q -n d1x-rebirth_v%{rebirth_version}-src
-dos2unix -k *.txt
+%setup -q -n dxx-rebirth-stable-%{rebirth_version}.x -a 3 -a 4
+# Fixup encoding and CTRL+Z at the end of the orderfrm.txt files
+iconv -f CP850 -t UTF-8 d1shar/ORDERFRM.TXT | head -n-3 > ORDERFRM.TXT
+touch -r d1shar/ORDERFRM.TXT ORDERFRM.TXT
+mv ORDERFRM.TXT d1shar/ORDERFRM.TXT
+cat d2shar10/orderfrm.txt | head -n-1 > orderfrm.txt
+touch -r d2shar10/orderfrm.txt orderfrm.txt
+mv orderfrm.txt d2shar10/orderfrm.txt
+# Prepare txt files for %%doc
+dos2unix -k d?x-rebirth/*.txt d1shar/*.TXT d1shar/README d2shar10/*.txt
+mkdir descent1-shareware-readmes descent2-shareware-readmes
+mv d1shar/*.TXT d1shar/README descent1-shareware-readmes
+mv d2shar10/*.txt descent2-shareware-readmes
+# Prepare the icons for installation
+convert d1x-rebirth/d1x-rebirth.xpm d1x-rebirth.png
+convert d2x-rebirth/d2x-rebirth.xpm d2x-rebirth.png
%build
-COMMON_FLAGS="prefix=/usr sharepath=%{_datadir}/%{name}/full ipv6=1 verbosebuild=1"
-export CFLAGS="$RPM_OPT_FLAGS"
+COMMON_FLAGS="prefix=/usr d1x_sharepath=%{_datadir}/d1x/full d2x_sharepath=%{_datadir}/d2x/full ipv6=1 verbosebuild=1"
+export CXXFLAGS="$RPM_OPT_FLAGS"
scons $COMMON_FLAGS opengl=0
-mv d1x-rebirth d1x-rebirth-sdl
+mv d1x-rebirth/d1x-rebirth d1x-rebirth-sdl
+mv d2x-rebirth/d2x-rebirth d2x-rebirth-sdl
scons $COMMON_FLAGS opengl=1
-mv d1x-rebirth d1x-rebirth-gl
+mv d1x-rebirth/d1x-rebirth d1x-rebirth-gl
+mv d2x-rebirth/d2x-rebirth d2x-rebirth-gl
%install
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/d1x/full
mkdir -p $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/d2x/full
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/d2x/d2shar
install -m 755 d1x-rebirth-sdl $RPM_BUILD_ROOT%{_bindir}
install -m 755 d1x-rebirth-gl $RPM_BUILD_ROOT%{_bindir}
+install -m 755 d2x-rebirth-sdl $RPM_BUILD_ROOT%{_bindir}
+install -m 755 d2x-rebirth-gl $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/d1x-rebirth
-tar x -z -C $RPM_BUILD_ROOT%{_datadir}/d1x -f %{SOURCE2}
-# fixup permissions from tarbal
-chmod 644 $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar/README
+install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/d2x-rebirth
+# Install descent 1 shareware files
+install -p -m 644 d1shar/descent.* $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar
+# Install descent 2 shareware files
+install -p -m 644 d2shar10/d2demo.{pig,hog,ham} \
+ $RPM_BUILD_ROOT%{_datadir}/d2x/d2shar
# below is the desktop file and icon stuff.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- d1x-rebirth.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
-install -p -m 644 d1x-rebirth.xpm \
+desktop-file-install \
+ --remove-key="Version" \
+ --set-key="Keywords" --set-value="game;fps;first;person;shooter;descent;" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ d1x-rebirth/d1x-rebirth.desktop
+desktop-file-install \
+ --remove-key="Version" \
+ --set-key="Keywords" --set-value="game;fps;first;person;shooter;descent;" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ d2x-rebirth/d2x-rebirth.desktop
+install -m 644 d1x-rebirth.png d2x-rebirth.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+install -p -m 644 %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/appdata
+appstream-util validate-relax --nonet \
+ $RPM_BUILD_ROOT%{_datadir}/appdata/d1x-rebirth.appdata.xml \
+ $RPM_BUILD_ROOT%{_datadir}/appdata/d2x-rebirth.appdata.xml
%files
-%doc COPYING.txt README.txt RELEASE-NOTES.txt
+%doc d1x-rebirth/README.txt d1x-rebirth/RELEASE-NOTES.txt
+%license COPYING.txt GPL-3.txt descent1-shareware-readmes
%{_bindir}/d1x-rebirth*
-%dir %{_datadir}/d1x
-%dir %{_datadir}/d1x/full
+%{_datadir}/d1x
+%{_datadir}/appdata/d1x-rebirth.appdata.xml
%{_datadir}/applications/d1x-rebirth.desktop
-%{_datadir}/icons/hicolor/128x128/apps/d1x-rebirth.xpm
+%{_datadir}/icons/hicolor/128x128/apps/d1x-rebirth.png
-%files shareware
-%{_datadir}/d1x/d1shar
+%files -n d2x
+%doc d2x-rebirth/README.txt d2x-rebirth/RELEASE-NOTES.txt
+%license COPYING.txt GPL-3.txt descent2-shareware-readmes
+%{_bindir}/d2x-rebirth*
+%{_datadir}/d2x
+%{_datadir}/appdata/d2x-rebirth.appdata.xml
+%{_datadir}/applications/d2x-rebirth.desktop
+%{_datadir}/icons/hicolor/128x128/apps/d2x-rebirth.png
%changelog
+* Sun Dec 16 2018 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.43-19.rebirth_v0.60
+- Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026)
+- Merge d1x-shareware package into the main-package so that installing d1x
+ from e.g. gnome-software always results in a functional game
+- Add appdata
+- New upstream includes d2x, add a d2x sub-package, including d2x demo levels
+- Trim changelog
+
* Sun Aug 19 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.43-18.rebirth_v0.58.1
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
@@ -136,82 +190,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Make the main package obsolete the -full subpackage
- Make the -shareware package only contain the shareware data files
- Add a desktop file and icon
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.43-8
-- rebuild for new F11 features
-
-* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-7
-- Rebuild for buildsys cflags issue
-
-* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-6
-- Release bump for rpmfusion build
-
-* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-5
-- Fix reading of player file (playerfile compat code) when using addon missions
-
-* Tue Sep 26 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-4
-- Fix building with newer SDL lib which is not directly linked against libX11
-
-* Sun Sep 24 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-3
-- Rebuild for FC-6
-- Tried switching to d1x-rebirth sources but didn't because they are unstable
- instead the following d1x-rebirth features were lifted:
- -scaleable cockpits in opengl mode
- -support for highres briefingscreens (download them from the dxx-rebirth web)
- -mouselook support
- -16:9 monitor support
- -store the resolution you're playing at in playername.dlx
-- Add/restore music playback, now you can enjoy the original descent music!
-- The player and other descent config files are now stored in ~/.d1x, so
- if you've got a player you want to keep move its files to ~/.d1x
-- The shareware version now uses the same game load/save code as the registered
- version allowing in game saving (ALT-F2 saves, ALT-F3 restores)
-- The shareware version can now properly read player files written by the
- registered version and vica versa
-
-* Sat Mar 18 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.43-2
-- Increase release after fixing BRs once more
-
-* Fri Mar 17 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-1
-- Fix BuidRequires for FC-5
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Wed Aug 10 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-0.lvn.4
-- Remove -Wno-pointer-sign from CFLAGS, this option is not valid for gcc 3.4 .
-
-* Sun Aug 7 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-0.lvn.3
-- Drop Patch 13, intergrate into Patch 0.
-- Add new Patch 13 which introduces some fixes from CVS.
-- Added Patch 14 which fixes:
- -a few buffer overflows caught by gcc 4 and an uninitialised var warning.
- -the sliders in the menus with newer gcc / glibc
- (or x86_64, but doesn't seem 64 bit related)
- -the 2 initial screens with opengl
- -made /usr/share/d1x/d1shar or /full the default mission dir
- -don't use descent2 fonts, these aren't in the hog file instead use fonts
- from d1bigfnt.zip .
-- Add d1bigfnt.zip and install the fonts in /usr/share/d1x/d1shar or /full.
-- Build without -fomit-framepointer to allow debugging (DEBUGABLE = 1).
-- Add Patch 15 to fix i386 (asm) compile.
-
-* Fri Apr 29 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-0.lvn.2
-- Added Patch 13 which fixes compilation with gcc4
-
-* Mon Jan 3 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.43-0.lvn.1
-- First Livna release, based on PLD SRPM.
-- Patches 0-10 are from PLD, have been reviewed and are all compilation fixes.
-- Patch 11 fixes 2 issues with the shareware version:
- -Pressing F1 no longer causes a segfault.
- -Saving now works.
-- Patch 12 brings in various fixes from the d1x cvs version.
-- Plans:
- -Save settings/games in ~/.d1x instead of in wd.
- -Search for custom levels in /usr/share/d1x/full,~/.d1x and a
- user configurable dir.
- -Fix/add music playback.
- -DesktopEntries
diff --git a/d2x-rebirth.appdata.xml b/d2x-rebirth.appdata.xml
new file mode 100644
index 0000000..15a548a
--- /dev/null
+++ b/d2x-rebirth.appdata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+ <id>d2x-rebirth.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>Descent 2</name>
+ <summary>3D spacecraft-based first person shooter</summary>
+ <description>
+ <p>
+ Descent 2 is a classic first person shooter. You control a space-ship which
+ is flying through a mine where the AI controlled robots have gone rogue.
+ Your task is to fight the robots and rescue the human workers.
+ </p>
+ <p>
+ Descent 2 is the sequel to the classic Descent, the first game featuring a
+ full 3D environment. In Descent 2 you control your space-ship with six
+ degrees of freedom movement.
+ </p>
+ <p>
+ This version of Descent 2 comes with the demo levels of the game.
+ If you want to play the full (registered/commercial) version of the game,
+ place the alien1.pig, alien2.pig, fire.pig, groupa.pig, ice.pig, water.pig,
+ descent2.hog, descent2.ham, descent2.s11 and descent2.s22 data-files from
+ your registered Descent 2 version in /usr/share/d2x/full;
+ or in $HOME/.d2x-rebirth.
+ </p>
+ <p>
+ If you want to have the movies also add the intro-h.mvl, other-h.mvl and
+ robots-h.mvl files to the dir.
+ </p>
+ </description>
+ <url type="homepage">https://www.dxx-rebirth.com/</url>
+ <screenshots>
+ <screenshot type="default">https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_screenshots/d2...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_screenshots/d2...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_screenshots/d2...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_screenshots/d2...</screenshot>
+ <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_screenshots/d2...</screenshot>
+ </screenshots>
+ <updatecontact>j.w.r.degoede_at_gmail.com</updatecontact>
+</component>
diff --git a/d2x-rebirth.sh b/d2x-rebirth.sh
new file mode 100644
index 0000000..0f95c7d
--- /dev/null
+++ b/d2x-rebirth.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
+
+if hasDri; then
+ D2X=/usr/bin/d2x-rebirth-gl
+else
+ D2X=/usr/bin/d2x-rebirth-sdl
+fi
+
+if [ '(' -f /usr/share/d2x/full/descent2.hog -a \
+ -f /usr/share/d2x/full/descent2.ham -a \
+ -f /usr/share/d2x/full/descent2.s11 -a \
+ -f /usr/share/d2x/full/descent2.s22 -a \
+ -f /usr/share/d2x/full/alien1.pig -a \
+ -f /usr/share/d2x/full/alien2.pig -a \
+ -f /usr/share/d2x/full/fire.pig -a \
+ -f /usr/share/d2x/full/groupa.pig -a \
+ -f /usr/share/d2x/full/ice.pig -a \
+ -f /usr/share/d2x/full/water.pig ')' -o \
+ '(' -f $HOME/.d2x-rebirth/descent2.hog -a \
+ -f $HOME/.d2x-rebirth/descent2.ham -a \
+ -f $HOME/.d2x-rebirth/descent2.s11 -a \
+ -f $HOME/.d2x-rebirth/descent2.s22 -a \
+ -f $HOME/.d2x-rebirth/alien1.pig -a \
+ -f $HOME/.d2x-rebirth/alien2.pig -a \
+ -f $HOME/.d2x-rebirth/fire.pig -a \
+ -f $HOME/.d2x-rebirth/groupa.pig -a \
+ -f $HOME/.d2x-rebirth/ice.pig -a \
+ -f $HOME/.d2x-rebirth/water.pig ')' ]; then
+ exec $D2X "$@"
+else
+ exec $D2X -hogdir /usr/share/d2x/d2shar/ "$@"
+fi
diff --git a/sources b/sources
index 5843aae..fad4e76 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
8112d6127a7a81a36735f5a9c3175ec2 d1swdf.tar.gz
-8f43e66191fdedd0c7ff9278719accf1 d1x-rebirth_v0.58.1-src.tar.gz
+1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz
+b94994c64922d152a3f3a317184c061e stable-0.60.x.zip
5 years, 11 months
[chromium-freeworld] Add relax libva version check patch
by Akarshan Biswas
commit 642054b7eb33a77abf56b57bfda6ffe409e0b767
Author: Akarshan Biswas <akarshanbiswas(a)akarshan-desk.biswasab.org>
Date: Tue Dec 11 12:42:50 2018 +0530
Add relax libva version check patch
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
relax-libva-version.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
---
diff --git a/relax-libva-version.patch b/relax-libva-version.patch
new file mode 100644
index 0000000..e297fd6
--- /dev/null
+++ b/relax-libva-version.patch
@@ -0,0 +1,56 @@
+From 6f1309ef8fe10965e4d0018b4f1b80ac6deccdaa Mon Sep 17 00:00:00 2001
+From: Azhar Shaikh <azhar.shaikh(a)intel.com>
+Date: Fri, 30 Nov 2018 23:11:57 +0000
+Subject: [PATCH] media/gpu/vaapi: Relax the version check for VA-API
+
+Since the newer versions of VA-API are ABI compatible, relax the
+version checks for VA-API, by using VA_CHECK_VERSION().
+This will help in updating the libva to the latest releases,
+while still supporting the old versions, till the new version of
+libva is merged and picked by the builds. Thus ensuring that
+hardware accleration is not broken while updating the libva.
+
+Bug: 905814
+TEST=libva-2.3.0 and libva-2.1.0 are able to do hardware acceleration.
+
+Suggested-by: Alexandre Courbot <acourbot(a)chromium.org>
+Signed-off-by: Azhar Shaikh <azhar.shaikh(a)intel.com>
+Change-Id: I510549f72290d20676927eeeeb89a87199c062af
+Reviewed-on: https://chromium-review.googlesource.com/c/1352519
+Reviewed-by: Alexandre Courbot <acourbot(a)chromium.org>
+Reviewed-by: Hirokazu Honda <hiroh(a)chromium.org>
+Commit-Queue: Miguel Casas <mcasas(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#612832}
+---
+
+diff --git a/AUTHORS b/AUTHORS
+index 567fe15..ff42fc5 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -103,6 +103,7 @@
+ Attila Dusnoki <dati91(a)gmail.com>
+ Avinaash Doreswamy <avi.nitk(a)samsung.com>
+ Ayush Khandelwal <k.ayush(a)samsung.com>
++Azhar Shaikh <azhar.shaikh(a)intel.com>
+ Balazs Kelemen <b.kelemen(a)samsung.com>
+ Baul Eun <baul.eun(a)samsung.com>
+ Behara Mani Shyam Patro <behara.ms(a)samsung.com>
+diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
+index b415642..053384d 100644
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -333,7 +333,13 @@
+ DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+- if (major_version != VA_MAJOR_VERSION || minor_version != VA_MINOR_VERSION) {
++ // The VAAPI version is determined from what is loaded on the system by
++ // calling vaInitialize(). We want a runtime evaluation of libva version,
++ // of what is loaded on the system, with, what browser is compiled with.
++ // Also since the libva is now ABI-compatible, relax the version check
++ // which helps in upgrading the libva, without breaking any existing
++ // functionality.
++ if (!VA_CHECK_VERSION(major_version, minor_version, 0)) {
+ LOG(ERROR) << "This build of Chromium requires VA-API version "
+ << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION
+ << ", system version: " << major_version << "." << minor_version;
5 years, 11 months
[chromium-freeworld] Update vaapi patch for 71 and add to patch to relax the version check for vaapi
by Akarshan Biswas
commit 780d7d295ad0223087b854a5182ac71d57ecbe24
Author: Akarshan Biswas <akarshanbiswas(a)akarshan-desk.biswasab.org>
Date: Tue Dec 11 12:40:16 2018 +0530
Update vaapi patch for 71 and add to patch to relax the version check for vaapi
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 9 ++++++--
enable-vaapi.patch | 56 ++++++++++++++++++++++++-------------------------
2 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index c148703..d12f220 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -297,7 +297,12 @@ Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch
# NOTE: This patch will never land upstream
Patch121: enable-vaapi.patch
Patch122: chromium-70.0.3538.110-vaapi-i686-fpermissive.patch
-
+# Since the newer versions of VA-API are ABI compatible, relax the version checks for VA-API, by using VA_CHECK_VERSION().
+# This will help in updating the libva to the latest releases,while still supporting the old versions, till the new version of
+# libva is merged and picked by the builds. Thus ensuring that hardware accleration is not broken while updating the libva.
+# Taken and rebased from https://chromium-review.googlesource.com/c/chromium/src/+/1352519
+# The patch might land somewhere in the future and will be removed.
+Patch123: relax-libva-version.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -849,7 +854,7 @@ udev.
%ifarch i686
%patch122 -p1 -b .i686permissive
%endif
-
+%patch123 -p1 -b .relaxva
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 6211000..1997af3 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,4 +1,4 @@
-From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
+From efdd5bdf093e9074c9eba73650ff5ad95b280ec8 Mon Sep 17 00:00:00 2001
From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Sun, 4 Nov 2018 20:26:54 +0530
Subject: [PATCH] Enable vaapi on Linux
@@ -17,10 +17,10 @@ Subject: [PATCH] Enable vaapi on Linux
10 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..39df8d6cf 100644
+index db54ccb61..f32075fb8 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1797,7 +1797,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -29,9 +29,9 @@ index d029d0648..39df8d6cf 100644
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(features::kOpenVR)},
- #endif // ENABLE_OPENVR
+@@ -2456,12 +2456,12 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
+ #endif // ENABLE_ISOLATED_XR_SERVICE
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
@@ -45,7 +45,7 @@ index d029d0648..39df8d6cf 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4371,12 +4371,14 @@ const FeatureEntry kFeatureEntries[] = {
"AutofillDropdownLayout")},
#endif // OS_ANDROID
@@ -63,10 +63,10 @@ index d029d0648..39df8d6cf 100644
flag_descriptions::kEnableHomeLauncherGesturesName,
flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..df8ecb24e 100644
+index 6cc51bbfb..3c4babe3d 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
+@@ -2996,9 +2996,9 @@ const char kTextSuggestionsTouchBarDescription[] =
#endif
@@ -78,7 +78,7 @@ index 0cb812619..df8ecb24e 100644
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+@@ -3006,6 +3006,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
@@ -97,7 +97,7 @@ index 0cb812619..df8ecb24e 100644
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
-@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+@@ -3524,12 +3536,6 @@ const char kUseMonitorColorSpaceDescription[] =
"Enables Chrome to use the color space information provided by the monitor"
" instead of the default sRGB color space.";
@@ -111,10 +111,10 @@ index 0cb812619..df8ecb24e 100644
"Experimental Chromecast support for Video Player";
const char kVideoPlayerChromecastSupportDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..14d7e33e9 100644
+index 944695782..38d8fe144 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+@@ -1824,13 +1824,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
@@ -139,7 +139,7 @@ index b3c5e5691..14d7e33e9 100644
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+@@ -2145,9 +2154,6 @@ extern const char kUseMashDescription[];
extern const char kUseMonitorColorSpaceName[];
extern const char kUseMonitorColorSpaceDescription[];
@@ -150,7 +150,7 @@ index b3c5e5691..14d7e33e9 100644
extern const char kVideoPlayerChromecastSupportDescription[];
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
-index 2196abef4..b4e0a1ae1 100644
+index 6f5f55de7..b90db3738 100644
--- a/components/viz/service/main/viz_main_impl.cc
+++ b/components/viz/service/main/viz_main_impl.cc
@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
@@ -185,10 +185,10 @@ index 8974e441d..d7eba85a9 100644
+ }
}
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index f589d015d..03fd1b44a 100644
+index 8397889b6..188d960a4 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
-@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrGpuMain");
@@ -197,7 +197,7 @@ index f589d015d..03fd1b44a 100644
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
-@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& parameters) {
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -207,10 +207,10 @@ index f589d015d..03fd1b44a 100644
#endif
diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 445953a64..0aac9ddb6 100644
+index cb6118b6a..7b8ea0f75 100644
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
-@@ -373,17 +373,6 @@
+@@ -369,17 +369,6 @@
"all"
]
},
@@ -229,10 +229,10 @@ index 445953a64..0aac9ddb6 100644
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index 684c1d5cf..e887e60bb 100644
+index 41bfa9172..30ca4f40a 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
-@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
+@@ -495,7 +495,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -242,7 +242,7 @@ index 684c1d5cf..e887e60bb 100644
#endif
return false;
diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
-index ab6215152..b8d1ee896 100644
+index d558b537a..9ad090e07 100644
--- a/media/filters/BUILD.gn
+++ b/media/filters/BUILD.gn
@@ -5,6 +5,7 @@
@@ -253,7 +253,7 @@ index ab6215152..b8d1ee896 100644
jumbo_source_set("filters") {
# Do not expand the visibility here without double-checking with OWNERS, this
-@@ -198,7 +199,7 @@ jumbo_source_set("filters") {
+@@ -200,7 +201,7 @@ jumbo_source_set("filters") {
deps += [ "//media/base/android" ]
}
@@ -263,10 +263,10 @@ index ab6215152..b8d1ee896 100644
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
-index 9ef4730a4..0c3a06c24 100644
+index 07bfdefda..7e33cd747 100644
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
-@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
+@@ -508,6 +508,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
}
}
@@ -279,7 +279,7 @@ index 9ef4730a4..0c3a06c24 100644
if (use_vaapi) {
test("jpeg_encode_accelerator_unittest") {
deps = [
-@@ -571,6 +577,7 @@ if (use_v4l2_codec || use_vaapi) {
+@@ -578,6 +584,7 @@ if (is_chromeos || is_linux) {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
@@ -288,5 +288,5 @@ index 9ef4730a4..0c3a06c24 100644
}
--
-2.19.1
+2.19.2
5 years, 11 months
[kodi/f29] Update to 18.0 RC3
by Michael Cronenworth
Summary of changes:
42b97dc... Update to 18.0 RC3 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
