[mpv/f24] Update to 0.18.0
by Sérgio M. Basto
Summary of changes:
79a79f2... Update to 0.18.0 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[mpv] Update to 0.18.0
by Sérgio M. Basto
commit 79a79f2ba8dbe948e3cec54ca853b589c2a98596
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jun 28 04:37:18 2016 +0100
Update to 0.18.0
.gitignore | 1 +
mpv.spec | 33 ++++++++++++++++++---------------
sources | 2 +-
3 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aff014c..a7d4f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
v0.14.0.tar.gz
+/v0.18.0.tar.gz
diff --git a/mpv.spec b/mpv.spec
index c3fcb4d..0f93627 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,5 +1,5 @@
Name: mpv
-Version: 0.17.0
+Version: 0.18.0
Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+
@@ -86,15 +86,14 @@ Libmpv development header files and libraries.
%build
CCFLAGS="%{optflags}" \
waf configure \
- --prefix="%{_prefix}" \
- --bindir="%{_bindir}" \
- --libdir="%{_libdir}" \
- --mandir="%{_mandir}" \
- --docdir="%{_docdir}/%{name}" \
- --confdir="%{_sysconfdir}/%{name}" \
+ --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --mandir=%{_mandir} \
+ --docdir=%{_docdir}/%{name} \
+ --confdir=%{_sysconfdir}/%{name} \
--disable-build-date \
--enable-libmpv-shared \
- --enable-gpl3 \
--enable-sdl2 \
--enable-encoding
@@ -104,21 +103,21 @@ waf build %{?_smp_mflags}
waf install --destdir=%{buildroot}
desktop-file-install etc/mpv.desktop
-install -Dpm 644 README.md %{buildroot}%{_docdir}/%{name}/README.md
+install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}
%post
-update-desktop-database &>/dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-update-desktop-database &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%post -n libmpv -p /sbin/ldconfig
@@ -136,6 +135,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
%files -n libmpv
+%license LICENSE Copyright
%{_libdir}/libmpv.so.*
%files -n libmpv-devel
@@ -144,6 +144,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Tue Jun 28 2016 Sérgio Basto <sergio(a)serjux.com> - 0.18.0-1
+- Update to 0.18.0
+
* Mon Apr 11 2016 Evgeny Lensky <surfernsk(a)gmail.com> - 0.17.0-1
- update to 0.17.0
diff --git a/sources b/sources
index 9a09b5d..d8d047a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6253da021af1fcc8c1998a190ac593cc v0.17.0.tar.gz
+d5bdc0751c4d1b5f8eaa9cb4762d5514 v0.18.0.tar.gz
7 years, 10 months
[vice] New upstream release 2.4.28
by jwrdegoede
commit e1aaf88df4b349688cc520e9c4dcd7bd31452f9e
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Jun 27 20:08:20 2016 +0200
New upstream release 2.4.28
.gitignore | 1 +
sources | 2 +-
vice-2.4.28-sdl-build-fix.patch | 11 +++++++++++
vice-norpath.patch | 18 +++++++++---------
vice.spec | 28 ++++++++++++++++++++--------
5 files changed, 42 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 820d723..5bd5a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ vice-miniicons.tar.bz2
vice-normalicons.tar.bz2
vice-2.4.tar.gz
vice-2.4.24.tar.gz
+vice-2.4.28.tar.gz
diff --git a/sources b/sources
index 4c51509..655855c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
-bd064f09908737951ccc75e734b6720c vice-2.4.24.tar.gz
+533554f5d7680b85c0954e4d4811274a vice-2.4.28.tar.gz
diff --git a/vice-2.4.28-sdl-build-fix.patch b/vice-2.4.28-sdl-build-fix.patch
new file mode 100644
index 0000000..6f340ac
--- /dev/null
+++ b/vice-2.4.28-sdl-build-fix.patch
@@ -0,0 +1,11 @@
+diff -up vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c~ vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c
+--- vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c~ 2016-05-18 23:40:30.000000000 +0200
++++ vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c 2016-06-27 19:11:06.260782212 +0200
+@@ -30,6 +30,7 @@
+
+ #ifdef UNIX_COMPILE
+ #include "../unix/ssi2001-drv.c"
++#include "../unix/io-access.c"
+ #endif
+
+ #if defined(WIN32_COMPILE) && !defined(__XBOX__)
diff --git a/vice-norpath.patch b/vice-norpath.patch
index 2cf8dfd..1bb4154 100644
--- a/vice-norpath.patch
+++ b/vice-norpath.patch
@@ -1,14 +1,14 @@
-diff -ru vice-2.4.24.orig/configure vice-2.4.24.new/configure
---- vice-2.4.24.orig/configure 2015-12-16 03:48:02.000000000 +0100
-+++ vice-2.4.24.new/configure 2016-01-30 17:15:32.625620278 +0100
-@@ -23490,10 +23490,6 @@
+diff -up vice-2.4.28/configure.norpath vice-2.4.28/configure
+--- vice-2.4.28/configure.norpath 2016-06-27 18:52:10.952861895 +0200
++++ vice-2.4.28/configure 2016-06-27 18:54:24.674315069 +0200
+@@ -24620,10 +24620,6 @@ _ACEOF
-# Add path with private dynamic ffmpeg libs to the search path
--if test x"$norpath" != "xyes"; then
-- LDFLAGS="$LDFLAGS -Wl,-rpath,$VICEDIR/lib"
--fi
-
- ac_config_files="$ac_config_files Makefile vice.spec vice-gtk.spec vice-mint.spec vice-mint-sdl.spec build/Makefile build/amigaos/Makefile build/android/build-android.sh build/android/Makefile build/beos/Makefile build/macosx/Makefile build/mingw32/Makefile build/minix3/Makefile build/nextstep/Makefile build/openstep/Makefile build/openwatcom/Makefile build/qnx4/Makefile build/rhapsody/Makefile data/Makefile data/C128/Makefile data/C64/Makefile data/C64DTV/Makefile data/CBM-II/Makefile data/DRIVES/Makefile data/PET/Makefile data/PLUS4/Makefile data/SCPU64/Makefile data/PRINTER/Makefile data/VIC20/Makefile data/fonts/Makefile doc/Makefile doc/building/Makefile doc/html/Makefile doc/readmes/Makefile man/Makefile src/Makefile src/debug.h src/gentranslate_h.sh src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/genintl_h.sh src/arch/amigaos/info-files/Makefile src/arch/amigaos/info-files/morphos/Makefile src/arch/amigaos/mui/Makefile src/arch/android/Makefile src/arch/
android/
AnVICE/AndroidManifest.xml src/arch/android/AnVICE/Makefile src/arch/android/AnVICE/.settings/Makefile src/arch/android/AnVICE/assets-proto/Makefile src/arch/android/AnVICE/jni/Makefile src/arch/android/AnVICE/jni/locnet/Makefile src/arch/android/AnVICE/jni/locnet_x64/Makefile src/arch/android/AnVICE/jni/locnet_x64dtv/Makefile src/arch/android/AnVICE/jni/locnet_x64sc/Makefile src/arch/android/AnVICE/jni/locnet_x128/Makefile src/arch/android/AnVICE/jni/locnet_xcbm2/Makefile src/arch/android/AnVICE/jni/locnet_xcbm5x0/Makefile src/arch/android/AnVICE/jni/locnet_xpet/Makefile src/arch/android/AnVICE/jni/locnet_xplus4/Makefile src/arch/android/AnVICE/jni/locnet_xscpu64/Makefile src/arch/android/AnVICE/jni/locnet_xvic/Makefile src/arch/android/AnVICE/jni/locnet_al/Makefile src/arch/android/AnVICE/jni/sdl/Makefile src/arch/android/AnVICE/jni/vice_c64cart/Makefile src/arch/android/AnVICE/jni/vice_c64exp/Makefile src/arch/android/AnVICE/jni/vice_cbm2common/Makefile src/arch/android/A
nVICE/jn
i/vice_common/Makefile src/arch/android/AnVICE/jni/vice_commonall/Makefile src/arch/android/AnVICE/jni/vice_commoncart/Makefile src/arch/android/AnVICE/jni/vice_crtc/Makefile src/arch/android/AnVICE/jni/vice_iec/Makefile src/arch/android/AnVICE/jni/vice_ieeepar/Makefile src/arch/android/AnVICE/jni/vice_tape/Makefile src/arch/android/AnVICE/jni/vice_vicii/Makefile src/arch/android/AnVICE/jni/vice_viciisc/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Makefile src/arch/android/AnVICE/jni/vice_xscpu64/Makefile src/arch/android/AnVICE/jni/vice_xvic/Makefile src/arch/android/AnVICE/res-proto/Makefile src/arch/android/AnVICE/res-proto/layout/Makefile
src/arc
h/android/AnVICE/res-proto/values/Makefile src/arch/android/AnVICE/src-proto/Makefile src/arch/android/AnVICE/src-proto/com/Makefile src/arch/android/AnVICE/src-proto/com/locnet/Makefile src/arch/android/AnVICE/src-proto/com/locnet/vice/Makefile src/arch/beos/Makefile src/arch/msdos/Makefile src/arch/os2/Makefile src/arch/os2/dialogs/Makefile src/arch/os2/doc/Makefile src/arch/os2/fonts/Makefile src/arch/os2/icons/Makefile src/arch/os2/kbd/Makefile src/arch/os2/snippets/Makefile src/arch/os2/unused/Makefile src/arch/os2/unused/pm/Makefile src/arch/os2/vac++/Makefile src/arch/os2/vac++/ctools/Makefile src/arch/os2/vac++/incl/Makefile src/arch/os2/vac++/x64/Makefile src/arch/os2/vac++/x64dtv/Makefile src/arch/os2/vac++/x64sc/Makefile src/arch/os2/vac++/x128/Makefile src/arch/os2/vac++/xcbm2/Makefile src/arch/os2/vac++/xcbm5x0/Makefile src/arch/os2/vac++/xpet/Makefile src/arch/os2/vac++/xplus4/Makefile src/arch/os2/vac++/xvic/Makefile src/arch/os2/watcom/Makefile src/arch/sdl/M
akefile
src/arch/sdl/dingoo-files/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arch/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/hpux/Makefile src/arch/unix/minix/Makefile src/arch/unix/next_open_rhap/Makefile src/arch/unix/next_open_rhap/vice.info src/arch/unix/qnx4/Makefile src/arch/unix/qnx6/Makefile src/arch/unix/readline/Makefile src/arch/unix/sco_sol/Makefile src/arch/unix/skyos/Makefile src/arch/unix/skyos/icons/Makefile src/arch/unix/x11/Makefile src/arch/unix/x11/gnome/Makefile src/arch/unix/x11/xaw/Makefile src/arch/unix/x11/xaw/widgets/Makefile src/arch/unix/macosx/Makefile src/arch/unix/macosx/cocoa/Makefile src/arch/unix/macosx/cocoa/view/Makefile src/arch/unix/macosx/cocoa/menu/Makefile src/arch/unix/macosx/cocoa/dialog/Makefile src/arch/unix/macosx/Resources/Makefile src/arch/unix/macosx/Resources/English.lproj/Makefile src/arch/watcom-source-wrappers/Makefile
src/arc
h/win32/Makefile src/arch/win32/vice-version.bat src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/msvc/Makefile src/arch/win32/msvc/wpcap/Makefile src/arch/win32/msvc/wpcap/net/Makefile src/arch/win32/utils/Makefile src/arch/win32/vs_tmpl/Makefile src/arch/win32/watcom/Makefile src/c128/Makefile src/c64/Makefile src/c64/cart/Makefile src/c64dtv/Makefile src/scpu64/Makefile src/cbm2/Makefile src/core/Makefile src/crtc/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dcr/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/platform/Makefile src/plus4/Makefile src
/printer
drv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile src/serial/Makefile src/sid/Makefile src/sounddrv/Makefile src/tape/Makefile src/userport/Makefile src/vdc/Makefile src/vdrive/Makefile src/vic20/Makefile src/vic20/cart/Makefile src/vicii/Makefile src/viciisc/Makefile src/viciivsid/Makefile src/video/Makefile src/version.h po/Makefile.in"
+-rpath_line=`${CONFIG_SHELL-/bin/sh} config.rpath "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "$VICEDIR/lib"`
+-LDFLAGS="$LDFLAGS $rpath_line"
+-
+ ac_config_files="$ac_config_files Makefile vice.spec vice-gtk.spec vice-mint.spec vice-mint-sdl.spec build/Makefile build/amigaos/Makefile build/android/build-android.sh build/android/Makefile build/beos/Makefile build/macosx/Makefile build/mingw32/Makefile build/minix3/Makefile build/nextstep/Makefile build/openstep/Makefile build/openwatcom/Makefile build/qnx4/Makefile build/rhapsody/Makefile data/Makefile data/C128/Makefile data/C64/Makefile data/C64DTV/Makefile data/CBM-II/Makefile data/DRIVES/Makefile data/PET/Makefile data/PLUS4/Makefile data/SCPU64/Makefile data/PRINTER/Makefile data/VIC20/Makefile data/fonts/Makefile doc/Makefile doc/building/Makefile doc/html/Makefile doc/readmes/Makefile man/Makefile src/Makefile src/debug.h src/gentranslate_h.sh src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/genintl_h.sh src/arch/amigaos/info-files/Makefile src/arch/amigaos/info-files/morphos/Makefile src/arch/amigaos/mui/Makefile src/arch/android/Makefile src/arch/
android/
AnVICE/AndroidManifest.xml src/arch/android/AnVICE/Makefile src/arch/android/AnVICE/.settings/Makefile src/arch/android/AnVICE/assets-proto/Makefile src/arch/android/AnVICE/jni/Makefile src/arch/android/AnVICE/jni/locnet/Makefile src/arch/android/AnVICE/jni/locnet_x64/Makefile src/arch/android/AnVICE/jni/locnet_x64dtv/Makefile src/arch/android/AnVICE/jni/locnet_x64sc/Makefile src/arch/android/AnVICE/jni/locnet_x128/Makefile src/arch/android/AnVICE/jni/locnet_xcbm2/Makefile src/arch/android/AnVICE/jni/locnet_xcbm5x0/Makefile src/arch/android/AnVICE/jni/locnet_xpet/Makefile src/arch/android/AnVICE/jni/locnet_xplus4/Makefile src/arch/android/AnVICE/jni/locnet_xscpu64/Makefile src/arch/android/AnVICE/jni/locnet_xvic/Makefile src/arch/android/AnVICE/jni/locnet_al/Makefile src/arch/android/AnVICE/jni/sdl/Makefile src/arch/android/AnVICE/jni/vice_c64cart/Makefile src/arch/android/AnVICE/jni/vice_c64exp/Makefile src/arch/android/AnVICE/jni/vice_cbm2common/Makefile src/arch/android/A
nVICE/jn
i/vice_common/Makefile src/arch/android/AnVICE/jni/vice_commonall/Makefile src/arch/android/AnVICE/jni/vice_commoncart/Makefile src/arch/android/AnVICE/jni/vice_crtc/Makefile src/arch/android/AnVICE/jni/vice_iec/Makefile src/arch/android/AnVICE/jni/vice_ieeepar/Makefile src/arch/android/AnVICE/jni/vice_tape/Makefile src/arch/android/AnVICE/jni/vice_vicii/Makefile src/arch/android/AnVICE/jni/vice_viciisc/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Makefile src/arch/android/AnVICE/jni/vice_xscpu64/Makefile src/arch/android/AnVICE/jni/vice_xvic/Makefile src/arch/android/AnVICE/res-proto/Makefile src/arch/android/AnVICE/res-proto/layout/Makefile
src/arc
h/android/AnVICE/res-proto/values/Makefile src/arch/android/AnVICE/src-proto/Makefile src/arch/android/AnVICE/src-proto/com/Makefile src/arch/android/AnVICE/src-proto/com/locnet/Makefile src/arch/android/AnVICE/src-proto/com/locnet/vice/Makefile src/arch/beos/Makefile src/arch/msdos/Makefile src/arch/os2/Makefile src/arch/os2/dialogs/Makefile src/arch/os2/doc/Makefile src/arch/os2/fonts/Makefile src/arch/os2/icons/Makefile src/arch/os2/kbd/Makefile src/arch/os2/snippets/Makefile src/arch/os2/unused/Makefile src/arch/os2/unused/pm/Makefile src/arch/os2/watcom/Makefile src/arch/sdl/Makefile src/arch/sdl/dingoo-files/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arch/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/hpux/Makefile src/arch/unix/minix/Makefile src/arch/unix/next_open_rhap/Makefile src/arch/unix/next_open_rhap/vice.info src/arch/unix/qnx4/Makefile src/arch/unix/
qnx6/Mak
efile src/arch/unix/readline/Makefile src/arch/unix/sco_sol/Makefile src/arch/unix/skyos/Makefile src/arch/unix/skyos/icons/Makefile src/arch/unix/x11/Makefile src/arch/unix/x11/gnome/Makefile src/arch/unix/x11/xaw/Makefile src/arch/unix/x11/xaw/widgets/Makefile src/arch/unix/macosx/Makefile src/arch/unix/macosx/cocoa/Makefile src/arch/unix/macosx/cocoa/view/Makefile src/arch/unix/macosx/cocoa/menu/Makefile src/arch/unix/macosx/cocoa/dialog/Makefile src/arch/unix/macosx/Resources/Makefile src/arch/unix/macosx/Resources/English.lproj/Makefile src/arch/watcom-source-wrappers/Makefile src/arch/win32/Makefile src/arch/win32/vice-version.bat src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/msvc/Makefile src/arch/win32/msvc/wpcap/Makefile src/arch/win32/msvc/wpcap/net/Makefile src/arch/win32/utils/Makefile src/arch/win32/vs_tmpl/Makefile src/arch/win32/watcom/Makefile src/c128/Makefile src/c64/Makefile src/c64/cart/Makefile src/c64dtv/Makefile src/scpu64/
Makefile
src/cbm2/Makefile src/core/Makefile src/crtc/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dcr/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/platform/Makefile src/plus4/Makefile src/printerdrv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile src/serial/Makefile src/sid/Makefile src/sounddrv/Makefile src/tape/Makefile src/tapeport/Makefile src/userport/Makefile src/vdc/Makefile src/vdrive/Makefile src/vic20/Makefile src/vic20/cart/Makefile src/vicii/Makefile src/viciisc/Makefile src/viciivsid/Makefile src/video/Makefile src/version.h
po/Makef
ile.in"
+ cat >confcache <<\_ACEOF
diff --git a/vice.spec b/vice.spec
index 4088a6a..3f8bafd 100644
--- a/vice.spec
+++ b/vice.spec
@@ -1,6 +1,6 @@
Name: vice
-Version: 2.4.24
-Release: 3%{?dist}
+Version: 2.4.28
+Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPLv2+
@@ -24,6 +24,7 @@ Source15: xvic.metainfo.xml
Patch1: vice-2.4.24-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-norpath.patch
+Patch4: vice-2.4.28-sdl-build-fix.patch
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
BuildRequires: libXrandr-devel
BuildRequires: giflib-devel libjpeg-devel libpng-devel
@@ -123,9 +124,13 @@ Vice Commodore VIC-20 Emulator.
%prep
%setup -c -q
pushd %{name}-%{version}
+sed -i 's/\r//' `find -name "*.h"`
+sed -i 's/\r//' `find -name "*.c"`
+sed -i 's/\r//' `find -name "*.cc"`
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .norpath
+%patch4 -p1 -z .norpath
for i in man/*.1 doc/*.info* README AUTHORS; do
iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
touch -r $i $i.tmp
@@ -135,8 +140,6 @@ popd
mv %{name}-%{version} %{name}-%{version}.gtk
cp -a %{name}-%{version}.gtk %{name}-%{version}.sdl
-# for %%doc
-ln -s %{name}-%{version}.gtk/doc doc
%build
@@ -149,18 +152,22 @@ export CXX=g++
pushd %{name}-%{version}.gtk
%configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS
+ # Ensure the system versions of these are used
+ rm -r src/lib/lib* src/lib/ffmpeg
make %{?_smp_mflags}
popd
pushd %{name}-%{version}.sdl
%configure --enable-sdlui $COMMON_FLAGS
+ # Ensure the system versions of these are used
+ rm -r src/lib/lib* src/lib/ffmpeg
make %{?_smp_mflags}
popd
%install
pushd %{name}-%{version}.gtk
-make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name}
+%make_install VICEDIR=%{_datadir}/%{name}
popd
pushd %{name}-%{version}.sdl
@@ -179,8 +186,8 @@ popd
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# for some reason make install drops a .txt and .pdf in the infodir ... ?
-rm -f $RPM_BUILD_ROOT%{_infodir}/%{name}.txt*
-rm -f $RPM_BUILD_ROOT%{_infodir}/%{name}.pdf*
+rm $RPM_BUILD_ROOT%{_infodir}/%{name}.txt*
+rm $RPM_BUILD_ROOT%{_infodir}/%{name}.pdf*
# vice installs its docs under /usr/share/vice/doc, we install them ourselves
# with %%doc, so nuke vice's install and create a symlink for the help function
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
@@ -240,7 +247,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files common -f %{name}.lang
%doc %{name}-%{version}.gtk/AUTHORS %{name}-%{version}.gtk/ChangeLog
%doc %{name}-%{version}.gtk/FEEDBACK %{name}-%{version}.gtk/README
-%doc doc/iec-bus.txt doc/html/*.html doc/html/images
+%doc %{name}-%{version}.gtk/doc/iec-bus.txt
+%doc %{name}-%{version}.gtk/doc/html/*.html
+%doc %{name}-%{version}.gtk/doc/html/images
%{_bindir}/c1541
%{_bindir}/cartconv
%{_bindir}/petcat
@@ -286,6 +295,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Jun 27 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4.28-1
+- New upstream release 2.4.28
+
* Mon Feb 22 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4.24-3
- Actually create the vice meta-package so that upgrades work
7 years, 10 months
[kaffeine] Patch for gcc6 and cmake changes
by Leigh Scott
commit ed8b668fc05a7f626d5d34e779f58be200b7884c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Jun 27 07:57:17 2016 +0100
Patch for gcc6 and cmake changes
kaffeine-1.2.2-cmake.patch | 11 +++++++++++
kaffeine-1.2.2-gcc6.patch | 32 ++++++++++++++++++++++++++++++++
kaffeine.spec | 11 +++++++++--
3 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/kaffeine-1.2.2-cmake.patch b/kaffeine-1.2.2-cmake.patch
new file mode 100644
index 0000000..13a89fb
--- /dev/null
+++ b/kaffeine-1.2.2-cmake.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,7 @@
+ add_definitions(-DQT_STRICT_ITERATORS)
+ endif(DEFINED QT_VERSION_MAJOR)
+
++include(CheckIncludeFiles)
+ check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
+
+ if(NOT HAVE_DVB)
+
diff --git a/kaffeine-1.2.2-gcc6.patch b/kaffeine-1.2.2-gcc6.patch
new file mode 100644
index 0000000..f52e102
--- /dev/null
+++ b/kaffeine-1.2.2-gcc6.patch
@@ -0,0 +1,32 @@
+--- a/src/dvb/dvbdevice.cpp
++++ b/src/dvb/dvbdevice.cpp
+@@ -353,8 +353,8 @@
+
+ switch (config->configuration) {
+ case DvbConfigBase::DiseqcSwitch: {
+- char cmd[] = { 0xe0, 0x10, 0x38, 0x00 };
+- cmd[3] = 0xf0 | (config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
++ char cmd[] = { char(0xe0), 0x10, 0x38, 0x00 };
++ cmd[3] = 0xf0 | char(config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
+ backend->sendMessage(cmd, sizeof(cmd));
+ usleep(15000);
+
+@@ -399,7 +399,7 @@
+ value |= 0xd000;
+ }
+
+- char cmd[] = { 0xe0, 0x31, 0x6e, (value / 256), (value % 256) };
++ char cmd[] = { char(0xe0), 0x31, 0x6e, char(value / 256), char(value % 256) };
+ backend->sendMessage(cmd, sizeof(cmd));
+ usleep(15000);
+ moveRotor = true;
+@@ -407,7 +407,7 @@
+ }
+
+ case DvbConfigBase::PositionsRotor: {
+- char cmd[] = { 0xe0, 0x31, 0x6b, config->lnbNumber };
++ char cmd[] = { char(0xe0), 0x31, 0x6b, char(config->lnbNumber) };
+ backend->sendMessage(cmd, sizeof(cmd));
+ usleep(15000);
+ moveRotor = true;
+
diff --git a/kaffeine.spec b/kaffeine.spec
index d7a65c6..41bcbe9 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
Patch100: kaffeine-1.2.2-gcc47.patch
+Patch101: kaffeine-1.2.2-gcc6.patch
+Patch102: kaffeine-1.2.2-cmake.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
@@ -33,7 +36,8 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
%patch100 -p1 -b .gcc47
-
+%patch101 -p1 -b .gcc6
+%patch102 -p1 -b .cmake
%build
mkdir -p %{_target_platform}
@@ -92,6 +96,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
+- Patch for gcc6 and cmake changes
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
7 years, 10 months
[VirtualBox/f24] Add VirtualBox-5.0.22-guest_soname.patch, do not hack SONAME for
by Sérgio M. Basto
commit 30ff3c1501eedd79dd68406bf5f9cb8775acc9b8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 26 03:44:59 2016 +0100
Add VirtualBox-5.0.22-guest_soname.patch, do not hack SONAME for
VBoxOGL and VBoxEGL in guest-additions.
VirtualBox-5.0.22-guest_soname.patch | 19 +++++++++++++++++++
VirtualBox.spec | 18 ++++++++++++------
2 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/VirtualBox-5.0.22-guest_soname.patch b/VirtualBox-5.0.22-guest_soname.patch
new file mode 100644
index 0000000..7d0255c
--- /dev/null
+++ b/VirtualBox-5.0.22-guest_soname.patch
@@ -0,0 +1,19 @@
+Do not change SONAME in Linux for VBoxOGL and VBoxEGL
+--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-06-24 20:01:44.794134277 +0100
++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-06-24 20:01:54.994262126 +0100
+@@ -227,7 +227,6 @@ if1of ($(KBUILD_TARGET), linux solaris f
+ dl
+ endif
+ else
+- VBoxOGL_SONAME.linux = libGL.so.1
+ VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
+ endif
+ endif
+@@ -711,7 +710,6 @@ VBoxEGL_TEMPLATE = VBOXCROGLR3GUES
+ VBoxEGL_SOURCES = egl.c
+ VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
+ VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
+-VBoxEGL_SONAME.linux = libEGL.so.1
+
+ include $(FILE_KBUILD_SUB_FOOTER)
+
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 26e43bc..10943b3 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -26,7 +26,7 @@
Name: VirtualBox
Version: 5.0.22
#Release: 6%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -49,12 +49,14 @@ Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
-# Upstream patch and I also added some fixes for gcc6
+# Upstream patches
Patch30: changeset_trunk_59959.diff
Patch31: changeset_trunk_59960.diff
-# just applied to Fedora 24+
+# I added some fixes for gcc6 just applied to Fedora 24+
Patch33: VirtualBox-gcc6-fixes.patch
+# just applied to Fedora 25+
Patch34: VirtualBox-5.0.16-glibc.patch
+Patch35: VirtualBox-5.0.22-guest_soname.patch
BuildRequires: kBuild >= 0.1.9998
@@ -204,9 +206,8 @@ rm -r tools/
rm -r src/VBox/Additions/x11/x11include/
rm -r src/VBox/Additions/x11/x11stubs/
#rm -r src/VBox/GuestHost/OpenGL/include/GL
-
-#rm include/VBox/HostServices/glext.h
-#rm include/VBox/HostServices/glxext.h
+rm include/VBox/HostServices/glext.h
+rm include/VBox/HostServices/glxext.h
#rm include/VBox/HostServices/wglext.h
#rm -rf src/libs/liblzf-3.4/
@@ -235,6 +236,7 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 24
%patch34 -p1 -b .glibc
%endif
+%patch35 -p1 -b .soname
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -677,6 +679,10 @@ fi
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Fri Jun 24 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.22-2
+- Add VirtualBox-5.0.22-guest_soname.patch, do not hack SONAME for
+ VBoxOGL and VBoxEGL in guest-additions.
+
* Fri Jun 24 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.22-1
- Update VirtualBox to 5.0.22
7 years, 10 months
[avidemux] Bump for rebuild in new infra.
by Richard Shaw
commit 41a4bb3c816671b9631a1092a04aa5d988d4aa20
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Sat Jun 25 21:19:40 2016 -0500
Bump for rebuild in new infra.
.gitignore | 1 +
avidemux.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b19436e..e1804eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
avidemux_2.6.10.tar.gz
+/avidemux_2.6.12.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index a3217f6..2675ef4 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.6.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -366,6 +366,9 @@ fi
%changelog
+* Sat Jun 25 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.12-2
+- Bump for rebuild in new infra.
+
* Mon Apr 4 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.12-1
- Fix library file permissions, BZ#3923.
diff --git a/sources b/sources
index 1fee30f..1ff27ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61addac2a03720c070aa0b6932cfc2db avidemux_2.6.10.tar.gz
+354d8ddf75d48d1f698786e8243ecc54 avidemux_2.6.12.tar.gz
7 years, 10 months
[mythweb/f24] Update to latest fixes.
by Richard Shaw
Summary of changes:
98e1c9b... Update to latest fixes. (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months