[vlc/f25] (3 commits) ...Avoid failing
by nchauvet
Summary of changes:
4ffbc39... Update snapshot merge jack into main (*)
f0652be... Add support for appdata (*)
3a12cc1... Avoid failing (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 1 month
[vlc] Avoid failing
by nchauvet
commit 3a12cc1ef0c7501d3252137d8684bfadef69a5fa
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 28 14:19:48 2016 +0200
Avoid failing
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 6d772ae..debe3a0 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -329,7 +329,7 @@ touch %{buildroot}%{_libdir}/vlc/plugins/plugins.dat
#Appdata
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+ %{buildroot}/%{_datadir}/appdata/*.appdata.xml || :
%find_lang %{name}
8 years, 1 month
[vlc] Add support for appdata
by nchauvet
commit f0652be8512d126068f2e02d6a45bc5a39aeeee0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 28 13:48:39 2016 +0200
Add support for appdata
vlc.spec | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 4b906b0..6d772ae 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -41,6 +41,7 @@ URL: http://www.videolan.org
Source0: http://nightlies.videolan.org/build/source/vlc-%{version}%{?vlc_rc}.tar.xz
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
%{?_with_bootstrap:
BuildRequires: gettext-devel
@@ -326,6 +327,10 @@ rm -rf %{buildroot}%{_docdir}/vlc
#Ghost the plugins cache
touch %{buildroot}%{_libdir}/vlc/plugins/plugins.dat
+#Appdata
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
%find_lang %{name}
@@ -372,6 +377,7 @@ fi || :
%files
%doc AUTHORS ChangeLog NEWS README THANKS
%license COPYING
+%{_datadir}/appdata/vlc.appdata.xml
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
%{_datadir}/icons/hicolor/*/apps/vlc*.png
@@ -494,6 +500,7 @@ fi || :
* Fri Oct 28 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.9
- Updateto 3.0.0 20161026-0238-git
- Merge vlc-plugin-jack into main
+- Add support for appdata
* Thu Sep 08 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.8
- Re-enable bootstrap
8 years, 1 month
[vlc] Update snapshot merge jack into main
by nchauvet
commit 4ffbc39ca826bd4f108bb8360329a8514d7a0232
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 28 13:09:46 2016 +0200
Update snapshot
merge jack into main
sources | 2 +-
vlc.spec | 41 +++++++++++++++--------------------------
2 files changed, 16 insertions(+), 27 deletions(-)
---
diff --git a/sources b/sources
index 5f999e5..b4f808c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4e1ea2323b576936ea55c7938d4f1c5 vlc-3.0.0-20160901-0221-git.tar.xz
+5fe68fda2cf92e0c677737203ec91721 vlc-3.0.0-20161026-0238-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 7373ef5..4b906b0 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,4 +1,4 @@
-%global vlc_rc -20160901-0221-git
+%global vlc_rc -20161026-0238-git
%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
@@ -32,7 +32,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -181,6 +181,10 @@ Requires: xdg-utils
Requires: hicolor-icon-theme
+#Merge back jack plugin into main
+Obsoletes: vlc-plugin-jack < %{version}-%{release}
+Provides: vlc-plugin-jack = %{version}-%{release}
+
%description
VLC media player is a highly portable multimedia player and multimedia framework
@@ -219,14 +223,6 @@ Requires: vlc-core%{_isa} = %{version}-%{release}
%description extras
VLC media player extras modules.
-%package plugin-jack
-Summary: JACK audio plugin for VLC
-Group: Applications/Multimedia
-Requires: vlc-core%{_isa} = %{version}-%{release}
-
-%description plugin-jack
-JACK audio plugin for the VLC media player.
-
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc:-git}
@@ -362,21 +358,11 @@ if [ $1 == 1 ] ; then
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
fi
-%post plugin-jack
-if [ $1 == 1 ] ; then
- %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
-fi
-
%postun extras
if [ $1 == 0 ] ; then
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
fi
-%postun plugin-jack
-if [ $1 == 0 ] ; then
- %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
-fi
-
%preun core
if [ $1 == 0 ] ; then
rm -f %{_libdir}/vlc/plugins*.dat
@@ -416,7 +402,12 @@ fi || :
%{?_with_projectm:
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
}
+%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
+%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+%{?_with_fluidsynth:
+%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+}
%files core -f %{name}.lang
%{_bindir}/vlc
@@ -475,12 +466,6 @@ fi || :
%{_libdir}/vlc/
%{_mandir}/man1/vlc*.1*
-%files plugin-jack
-%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
-%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
-%{?_with_fluidsynth:
-%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
-}
%files extras
%{?_with_opencv:
@@ -506,6 +491,10 @@ fi || :
%changelog
+* Fri Oct 28 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.9
+- Updateto 3.0.0 20161026-0238-git
+- Merge vlc-plugin-jack into main
+
* Thu Sep 08 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.8
- Re-enable bootstrap
8 years, 1 month
[live555/f25] Update to 2016.10.21
by nchauvet
Summary of changes:
d61cd7a... Update to 2016.10.21 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 1 month
[live555] Update to 2016.10.21
by nchauvet
commit d61cd7adb3d4473b69f9709d05162ec58870207a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 28 12:48:56 2016 +0200
Update to 2016.10.21
.gitignore | 1 +
live555.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 229d86a..98ddea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
live.2014.10.21.tar.gz
/live.2016.07.19.tar.gz
+/live.2016.10.21.tar.gz
diff --git a/live555.spec b/live555.spec
index b779a56..5b2e833 100644
--- a/live555.spec
+++ b/live555.spec
@@ -1,6 +1,6 @@
Name: live555
-Version: 2016.07.19
-Release: 3%{?dist}
+Version: 2016.10.21
+Release: 1%{?dist}
Summary: Live555.com streaming libraries
Group: System Environment/Libraries
@@ -121,6 +121,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so*
%changelog
+* Fri Oct 28 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2016.10.21-1
+- Update to 2016.10.21
+
* Tue Aug 16 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2016.07.19-3
- Add hardening flags to LDFLAGS
diff --git a/sources b/sources
index ddf9c53..ad0e95c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d58ab16f8e36bc6adcca1ffd785d07a live.2016.07.19.tar.gz
+3b1f04f17ac5206d9d1930fcc998a94e live.2016.10.21.tar.gz
8 years, 1 month
[VirtualBox/f24] (24 commits) ...Fixes for EL7 and X.org-1.19
by Sérgio M. Basto
Summary of changes:
4ba0682... Set attributes on make install. (*)
d79b3ff... Packaging:Scriptlets review Systemd, Icon Cache, mimeinf an (*)
a3a7f0f... Sync changelog with github.com/sergiomb2/VirtualBox/tree/de (*)
0e3c298... Add changelog. (*)
db091b2... Add back RPMFusion strings to VBox.sh it is used (*)
16604ed... Use PeriodNever like Mageia (*)
4066043... Create VirtualBox-qt sub-package rfbz#1169 (*)
c8da9ca... Upstream rules: (*)
0ed2592... Add Mageia fix revert-VBox.sh.patch (*)
85bb047... Update descriptions and add some comments (*)
42143ce... Review Scriptlets for starting vboxservice.service (*)
de50be8... Adjust vboxdrv.rules and move to 60-vboxdrv.rules (*)
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 (*)
6fd9f1e... Some fixes: (*)
5295a4e... Add more one ifdef in VirtualBox-5.0.18-xserver_guest.patch (*)
a30ccdd... Rebase VirtualBox-5.0.22-guest_soname.patch (*)
59f1cc2... Minor issues (*)
92f4bb5... Minor improves on VirtualBox-5.0.18-xserver_guest (*)
fccafb9... Update VBox to 5.1.8 (*)
3407f6b... Fixes for EL7 and X.org-1.19 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 1 month
[VirtualBox] Fixes for EL7 and X.org-1.19
by Sérgio M. Basto
commit 3407f6b08489f447b3847dc253d4896df78c4f93
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Oct 28 02:36:04 2016 +0100
Fixes for EL7 and X.org-1.19
VirtualBox-5.0.18-xserver_guest.patch | 9 ---------
VirtualBox-5.0.18-xserver_guest_xorg19.patch | 12 ++++++++++++
VirtualBox.spec | 21 ++++++++++++++++-----
vboxservice.service | 5 ++++-
4 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch
index 1a94a05..300f09a 100644
--- a/VirtualBox-5.0.18-xserver_guest.patch
+++ b/VirtualBox-5.0.18-xserver_guest.patch
@@ -106,15 +106,6 @@ xf86_ansic.h doesn't exist anymore.
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 := \
@@ -384,7 +384,6 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
vboxvideo_drv_system_INCS += \
diff --git a/VirtualBox-5.0.18-xserver_guest_xorg19.patch b/VirtualBox-5.0.18-xserver_guest_xorg19.patch
new file mode 100644
index 0000000..60b721a
--- /dev/null
+++ b/VirtualBox-5.0.18-xserver_guest_xorg19.patch
@@ -0,0 +1,12 @@
+Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
+--- ./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 6c2654e..1bc6085 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -25,7 +25,7 @@
Name: VirtualBox
Version: 5.1.8
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -45,6 +45,7 @@ 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-5.0.18-xserver_guest.patch
+Patch24: VirtualBox-5.0.18-xserver_guest_xorg19.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-gcc.patch
# from Debian
@@ -262,6 +263,9 @@ rm -r src/libs/zlib-1.2.8/
%patch22 -p1 -b .gsoap
%endif
%patch23 -p1 -b .xserver_guest
+%if 0%{?fedora}
+%patch24 -p1 -b .xserver_guest_xorg19
+%endif
%patch26 -p1 -b .nobundles
#patch27 -p1 -b .gcc
%if 0%{?fedora} > 20
@@ -467,8 +471,10 @@ install -p -m 0644 obj/bin/virtualbox.xml %{buildroot}%{_datadir}/mime/packages
#
# [1] https://www.virtualbox.org/changeset/43588/vbox
-#install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
-# %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%if 0%{?rhel}
+install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
+ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%endif
# Guest-additions tools
install -m 0755 -t %{buildroot}%{_sbindir} \
@@ -738,8 +744,10 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_sbindir}/VBoxService
%{_sbindir}/mount.vboxsf
%{_libdir}/security/pam_vbox.so
-# do not use xorg module drive
-#{_libdir}/xorg/modules/drivers/*
+%if 0%{?rhel}
+# do not use xorg module drive in newer versions
+%{_libdir}/xorg/modules/drivers/*
+%endif
%{_libdir}/VBox*.so
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -752,6 +760,9 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Oct 19 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.8-2
+- Fixes for EL7 and X.org-1.19
+
* Tue Oct 18 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.8-1
- Update VBox to 5.1.8
diff --git a/vboxservice.service b/vboxservice.service
index 41ad4d1..8caa696 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -1,6 +1,9 @@
[Unit]
Description=VirtualBox guest services
-ConditionVirtualization=oracle
+#RHEL7 says that Virtualization is kvm !?
+ConditionVirtualization=|kvm
+ConditionVirtualization=|oracle
+
[Service]
ExecStart=/usr/sbin/VBoxService -f
8 years, 1 month