[VirtualBox/f25] (5 commits) ...Refactor the patch
by Sérgio M. Basto
Summary of changes:
723d423... Remove one line that belongs to akmods process. (*)
840b6fc... Add vboxpci to rmmod instructions. (*)
435d800... rfbz#1169 v2, use another sub-package schema. (*)
4dac8c3... Join 2 patches in one and stop building vboxvideo_drv.so (*)
d3a5c5f... Refactor the patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 6 months
[VirtualBox] Refactor the patch
by Sérgio M. Basto
commit d3a5c5f2e3148944ba13cd536af1f860d40c9c1b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Oct 12 04:26:57 2016 +0100
Refactor the patch
using VBOX_USE_SYSTEM_XORG_HEADERS instead drop and replace code, for include
upstream, also add MIT License.
VirtualBox-5.0.18-xserver_guest.patch | 106 +++++++++++++++++++++++++---------
1 file changed, 78 insertions(+), 28 deletions(-)
---
diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch
index 72c0b93..5beefb8 100644
--- a/VirtualBox-5.0.18-xserver_guest.patch
+++ b/VirtualBox-5.0.18-xserver_guest.patch
@@ -1,44 +1,94 @@
-We also should use VBOX_USE_SYSTEM_XORG_HEADERS here:
-Just compile with X11 system source and we may remove bundle X11 source code.
+Copyright (c) 2016 Sérgio Basto
---- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
-+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
-@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The MIT License is to allow be in included in VirtualBox source code.
+
+Using also VBOX_USE_SYSTEM_XORG_HEADERS to build guest additions parts,
+just compile with X11 system source and we may remove all bundle X11 source code.
+
+when we use VBOX_USE_SYSTEM_XORG_HEADERS, we don't need compile the very old
+VBoxGuestR3LibXFree86 for use with old servers where the C library is not
+available and becasue fail to build when we unbundle all X11 sources, files like
+xf86_ansic.h doesn't exist anymore.
+
+--- ./Config.kmk.orig 2016-10-12 02:27:19.650378571 +0100
++++ ./Config.kmk 2016-10-12 02:29:40.308912309 +0100
+@@ -2362,6 +2362,7 @@ ifdef VBOX_WITH_CROGL
+ endif
+
+ if1of ($(KBUILD_TARGET), freebsd linux solaris)
++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+ # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
+ VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
+ VBOX_MESA_INCS = \
+@@ -2372,6 +2373,7 @@ ifdef VBOX_WITH_CROGL
+ $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
+ $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
+ endif
++ endif
+
+ VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
+ VBOX_DARWIN_OPENGL_HEADERS = gl.h glu.h
+--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-10-12 02:45:13.748143934 +0100
++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-10-12 02:51:58.881590957 +0100
+@@ -67,6 +67,15 @@ endif
+ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_INCS += \
-- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
-- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
-- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
-- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
-- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
-- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
-- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
-- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
-- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
++ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
++ VBoxOGL_INCS += \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
- $(VBOX_MESA_INCS) \
-- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
++ $(VBOX_MESA_INCS) \
+ /usr/include/drm \
+ /usr/include/libdrm
++ else
+ VBoxOGL_INCS += \
+ $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+ $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+@@ -81,6 +90,7 @@ if1of ($(KBUILD_TARGET), linux solaris f
+ $(VBOX_MESA_INCS) \
+ $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
++ endif
endif
-@@ -214,10 +208,10 @@
+ ifdef VBoxOGL_DRI
+@@ -213,11 +223,19 @@ VBoxOGL_LIBS.win += \
+ $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
-- $(PATH_STAGE_LIB)/libXcomposite.so \
-- $(PATH_STAGE_LIB)/libXdamage.so \
-- $(PATH_STAGE_LIB)/libXfixes.so \
-- $(PATH_STAGE_LIB)/libXext.so
-+ Xcomposite \
-+ Xdamage \
-+ Xfixes \
-+ Xext
+- VBoxOGL_LIBS += \
++ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
++ VBoxOGL_LIBS += \
++ Xcomposite \
++ Xdamage \
++ Xfixes \
++ Xext
++ else
++ VBoxOGL_LIBS += \
+ $(PATH_STAGE_LIB)/libXcomposite.so \
+ $(PATH_STAGE_LIB)/libXdamage.so \
+ $(PATH_STAGE_LIB)/libXfixes.so \
+ $(PATH_STAGE_LIB)/libXext.so
++endif
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
7 years, 6 months
[VirtualBox] Join 2 patches in one and stop building vboxvideo_drv.so
by Sérgio M. Basto
commit 4dac8c3662aa604ae4345a8072524e58bb517c60
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Oct 11 14:30:24 2016 +0100
Join 2 patches in one and stop building vboxvideo_drv.so
vboxvideo_drv.so is not used since 5.0.18 and vboxvideo_drv.so doesn't build
with X.Org version 1.19, so simple skip vboxvideo_drv.so from the build to fix
all package build.
VirtualBox-4.3.0-VBoxGuestLib.patch moved into
VirtualBox-4.3.10-xserver_guest.patch and rename to
VirtualBox-5.0.18-xserver_guest.patch
VirtualBox-4.3.0-VBoxGuestLib.patch | 16 -------------
....patch => VirtualBox-5.0.18-xserver_guest.patch | 26 ++++++++++++++++++++++
VirtualBox.spec | 11 ++++-----
3 files changed, 32 insertions(+), 21 deletions(-)
---
diff --git a/VirtualBox-4.3.10-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch
similarity index 54%
rename from VirtualBox-4.3.10-xserver_guest.patch
rename to VirtualBox-5.0.18-xserver_guest.patch
index 7e107d6..72c0b93 100644
--- a/VirtualBox-4.3.10-xserver_guest.patch
+++ b/VirtualBox-5.0.18-xserver_guest.patch
@@ -1,3 +1,4 @@
+We also should use VBOX_USE_SYSTEM_XORG_HEADERS here:
Just compile with X11 system source and we may remove bundle X11 source code.
--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
@@ -41,3 +42,28 @@ Just compile with X11 system source and we may remove bundle X11 source code.
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100
+@@ -40,9 +40,11 @@ LIBRARIES += \
+ VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_VALIDATIONKIT
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+ LIBRARIES += \
+ VBoxGuestR3LibXFree86
+ endif
++ endif
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+ LIBRARIES += \
+ VBoxGuestR3LibXOrg
+--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182 +0100
++++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+ # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
+- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
+ SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+ vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_system_CFLAGS := \
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d82249f..be7f73b 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -15,7 +15,7 @@
%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
%bcond_without webservice
-%if 0%{?rhel}
+%if 0%{?rhel} || 0%{?fedora} > 25
%bcond_with docs
%else
%bcond_without docs
@@ -44,14 +44,13 @@ Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
-Patch23: VirtualBox-4.3.10-xserver_guest.patch
-Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch
+Patch23: VirtualBox-5.0.18-xserver_guest.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
Patch29: 29-fix-ftbfs-as-needed.patch
-# Patch34 just applied to Fedora 25+
+# glibc is just applied to Fedora 25+ but Oracle opt by another fix
Patch34: VirtualBox-5.0.16-glibc.patch
Patch35: VirtualBox-5.0.22-guest_soname.patch
Patch37: smap.diff
@@ -265,7 +264,6 @@ rm -r src/libs/zlib-1.2.8/
%patch22 -p1 -b .gsoap
%endif
%patch23 -p1 -b .xserver_guest
-%patch24 -p1 -b .guestlib
%patch26 -p1 -b .nobundles
#patch27 -p1 -b .gcc
%if 0%{?fedora} > 20
@@ -300,6 +298,7 @@ sed -i 's/\r//' COPYING
#--disable-java
#--disable-xpcom
. ./env.sh
+umask 0022
#TODO fix publisher in copr
%global publisher _%{?vendor:%(echo "%{vendor}" | \
@@ -762,6 +761,8 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
expect). Also is more simple deal with dependencies.
- Add vboxpci to rmmod instructions.
- Remove one line that belongs to akmods process.
+- Just building kernel driver for X.Org Server fix building with X.Org Server
+ 1.19 (guest-additions).
* Thu Sep 15 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-2
- Packaging:Scriptlets review Systemd, Icon Cache, mimeinfo and desktop-database
7 years, 6 months
[VirtualBox] rfbz#1169 v2, use another sub-package schema.
by Sérgio M. Basto
commit 435d8008a5ee5e8c4ee82b3a8404436c930d2c04
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Oct 8 02:21:58 2016 +0100
rfbz#1169 v2, use another sub-package schema.
Core sub-package now is called server and main package is Qt part (as end user
expect). Also is more simple deal with dependencies.
VirtualBox.spec | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9327136..d82249f 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -25,10 +25,9 @@
Name: VirtualBox
Version: 5.1.6
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
-Group: Development/Tools
License: GPLv2 or (GPLv2 and CDDL)
URL: http://www.virtualbox.org/wiki/VirtualBox
Source0: http://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtual...
@@ -137,17 +136,23 @@ ExclusiveArch: i586 x86_64
ExclusiveArch: i386 x86_64
%endif
+Group: System/Emulators/PC
+Requires: %{name}-server%{?isa} = %{version}
+Provides: %{name}-gui = %{version}
+Obsoletes: %{name}-qt
+
+%description
+Qt GUI part for %{name}.
+
+%package server
+Summary: core part (host server) for %{name}
+Group: Development/Tools
Requires: %{name}-kmod = %{version}
-%if 0%{?fedora} > 0
-Recommends: %{name}-qt = %{version}
-%else
-Requires: %{name}-qt = %{version}
-%endif
Provides: %{name}-kmod-common = %{version}-%{release}
Conflicts: %{name}-guest <= %{version}-%{release}
Conflicts: %{name}-guest-additions <= %{version}-%{release}
-%description
+%description server
VirtualBox is a powerful x86 and AMD64/Intel64 virtualization product for
enterprise as well as home use. Not only is VirtualBox an extremely feature
rich, high performance product for enterprise customers, it is also the only
@@ -160,15 +165,6 @@ Windows (NT 4.0, 2000, XP, Server 2003, Vista, Windows 7, Windows 8, Windows
10), DOS/Windows 3.x, Linux (2.4, 2.6, 3.x and 4.x), Solaris and OpenSolaris,
OS/2, and OpenBSD.
-%package qt
-Summary: Qt GUI part for %{name}
-Group: System/Emulators/PC
-Requires: %{name} = %{version}
-Provides: %{name}-gui = %{version}
-
-%description qt
-Qt GUI part for %{name}.
-
%if %{with webservice}
%package webservice
Summary: WebService GUI part for %{name}
@@ -650,7 +646,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
/sbin/ldconfig
%systemd_postun_with_restart vboxservice.service
-%files
+%files server
%doc doc/*cpp doc/VMM
%if %{with docs}
%doc obj/bin/UserManual*.pdf
@@ -709,7 +705,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_prefix}/lib/modules-load.d/%{name}.conf
%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
-%files qt
+%files
%{_bindir}/VirtualBox
%{_bindir}/virtualbox
%{_libdir}/virtualbox/VBoxTestOGL
@@ -760,6 +756,13 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Oct 08 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-3
+- rfbz#1169 v2, use another sub-package schema.
+ Core sub-package now is called server and main package is Qt part (as end user
+ expect). Also is more simple deal with dependencies.
+- Add vboxpci to rmmod instructions.
+- Remove one line that belongs to akmods process.
+
* Thu Sep 15 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-2
- Packaging:Scriptlets review Systemd, Icon Cache, mimeinfo and desktop-database
- Add back RPMFusion strings to VBox.sh it is used on /usr/bin/VBox
7 years, 6 months
[VirtualBox] Add vboxpci to rmmod instructions.
by Sérgio M. Basto
commit 840b6fc2bf7107211cca2274e6c702362ff66182
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Oct 8 02:21:19 2016 +0100
Add vboxpci to rmmod instructions.
VirtualBox-5.1.0-strings.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/VirtualBox-5.1.0-strings.patch b/VirtualBox-5.1.0-strings.patch
index f2d9666..2e45fd2 100644
--- a/VirtualBox-5.1.0-strings.patch
+++ b/VirtualBox-5.1.0-strings.patch
@@ -24,7 +24,7 @@ Replace some strings with ones that (sometimes) make more sense.
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
-+ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>"
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPMFusion version and the Oracle version of VirtualBox."
7 years, 6 months
[VirtualBox] Remove one line that belongs to akmods process.
by Sérgio M. Basto
commit 723d423513a78c4c877225e36695bb799321ccf2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Oct 8 02:18:33 2016 +0100
Remove one line that belongs to akmods process.
VirtualBox.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9f95573..9327136 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -13,7 +13,6 @@
# userspace.
#global prerel 106108
%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
%bcond_without webservice
%if 0%{?rhel}
7 years, 6 months
[fdkaac/f24] Initial push
by Christopher Atherton
Summary of changes:
9b183c5... Initial push (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 6 months
[fdkaac] Initial push
by Christopher Atherton
commit 9b183c5dabe50a3dc1fb080d0f6c0a9f993913c1
Author: Christopher Atherton <the8lack8ox(a)gmail.com>
Date: Tue Oct 11 19:17:13 2016 -0400
Initial push
.gitignore | 1 +
fdkaac.spec | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 63 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..35b6678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/fdkaac-0.6.3.tar.gz
diff --git a/fdkaac.spec b/fdkaac.spec
new file mode 100644
index 0000000..6e2eb33
--- /dev/null
+++ b/fdkaac.spec
@@ -0,0 +1,61 @@
+Name: fdkaac
+Version: 0.6.3
+Release: 3%{?dist}
+Summary: Command line frontend for libfdk-aac encoder
+
+License: zlib
+URL: https://github.com/nu774/%{name}
+Source: https://github.com/nu774/%{name}/archive/v%{version}.tar.gz#/%{name}-%{ve...
+
+BuildRequires: autoconf automake
+BuildRequires: fdk-aac-devel
+
+
+%description
+fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format,
+and encodes it into either M4A / AAC file.
+
+If the input file is "-", data is read from stdin. Likewise, if the
+output file is "-", data is written to stdout if one of streamable AAC
+transport formats are selected by -f.
+
+When CAF input and M4A output is used, tags in CAF file are copied into
+the resulting M4A.
+
+
+%prep
+%autosetup
+
+
+%build
+autoreconf -fiv
+%configure
+%make_build
+
+%install
+%make_install
+
+
+%files
+%license COPYING
+%doc README ChangeLog
+%{_bindir}/fdkaac
+%{_mandir}/man1/*
+
+
+%changelog
+* Fri Sep 16 2016 Christopher Atherton <the8lack8ox(a)gmail.com> - 0.6.3-3
+- Add BuildRequires autoconf automake
+
+* Fri Sep 16 2016 Christopher Atherton <the8lack8ox(a)gmail.com> - 0.6.3-2
+- Spec file cleanup
+
+* Sun Sep 11 2016 Christopher Atherton <the8lack8ox(a)gmail.com> - 0.6.3-1
+- Update to latest release
+- Spec file cleanup
+
+* Wed Jan 13 2016 Christopher Atherton <the8lack8ox(a)gmail.com> - 0.6.2-2
+- Change package name to fdkaac-cli
+
+* Mon Jan 11 2016 Christopher Atherton <the8lack8ox(a)gmail.com> - 0.6.2-1
+- Initial spec
diff --git a/sources b/sources
index e69de29..b9fef35 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+20cdcfcf1e3ea4060f021b6eefa9b75b fdkaac-0.6.3.tar.gz
7 years, 6 months
[xorg-x11-drv-nvidia] Switch to system libglvnd
by Leigh Scott
commit 6ecfbc0e43e7a6824bd70a41f02431312bab8ca2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 11 12:20:59 2016 +0100
Switch to system libglvnd
xorg-x11-drv-nvidia.spec | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ae702ec..df34614 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 370.28
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -125,8 +125,7 @@ Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
-# GlVND
-#Requires: libglvnd
+Requires: libglvnd%{_isa}
%description libs
This package provides the shared libraries for %{name}.
@@ -167,8 +166,6 @@ rm -f nvidia-installer*
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
-# GLVND note: If kwizart doesn't add a ld.so.conf.d file to glvnd we will need to add it here
-# ld.so.conf.d file
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
@@ -177,7 +174,7 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
# GLVND
-#rm libGL.so.%{version}
+rm libGL.so.%{version}
# Simple wildcard install of libs
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}
@@ -187,14 +184,14 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
%endif
-# install stuff the wildcard missed
-install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/
-ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so
-install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
-
# GlVND
ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0
+# Fix unowned lib links
+ln -s libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL_nvidia.so.0
+ln -s libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLESv2_nvidia.so.2
+ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_nvidia.so.0
+
%ifarch x86_64 i686
# OpenCL config
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
@@ -539,7 +536,6 @@ fi ||:
%endif
%{_libdir}/vdpau/libvdpau_nvidia.so
%{_nvidia_libdir}/libnvidia-ifr.so
-%{_nvidia_libdir}/libEGL.so
%{_nvidia_libdir}/libEGL_nvidia.so
%{_nvidia_libdir}/libGLESv1_CM_nvidia.so
%{_nvidia_libdir}/libGLESv2_nvidia.so
@@ -548,11 +544,13 @@ fi ||:
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
-# GlVND note: remove libGL.so
-%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Tue Oct 11 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:370.28-4
+- Switch to system libglvnd
+- Fix unowned file links
+
* Fri Sep 30 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:370.28-3
- add xorg abi override
7 years, 6 months
[kodi] Update to 17.0 beta 3
by Michael Cronenworth
commit 987e817b4fb1ab379f7304b13988ba1e793029e8
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Oct 10 15:25:31 2016 -0500
Update to 17.0 beta 3
.gitignore | 2 +-
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 7 +++++--
sources | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3db29b2..aa34a67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kodi-17.0b2-patched.tar.xz
+/kodi-17.0b3-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 4280ada..9a9692c 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=17
-MINORVERSION=0b2
+MINORVERSION=0b3
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Krypton
diff --git a/kodi.spec b/kodi.spec
index 67674f6..00c978b 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE b2
+%global PRERELEASE b3
#global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -8,7 +8,7 @@
Name: kodi
Version: 17.0
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -400,6 +400,9 @@ fi
%changelog
+* Mon Oct 10 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.7
+- Kodi 17 beta 3
+
* Mon Sep 19 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.6
- Kodi 17 beta 2
diff --git a/sources b/sources
index 241750c..087d1f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79648330ceb9c8f5b84b2fc302839898 kodi-17.0b2-patched.tar.xz
+6955fb8bb8be0b56b0c1781f4825cc1c kodi-17.0b3-patched.tar.xz
7 years, 6 months