[vidcutter/f28] Update to 6.0.0
by Martin Gansser
Summary of changes:
68e7a43... Update to 6.0.0 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[vidcutter] Update to 6.0.0
by Martin Gansser
commit 68e7a43065e244791f7efadfbf6825ca60f5e4b5
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Jun 29 10:55:59 2018 +0200
Update to 6.0.0
.gitignore | 1 +
sources | 2 +-
vidcutter.spec | 29 ++++++++++++++++-------------
3 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cc8e16..c0313d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/vidcutter-4.0.5.tar.gz
/vidcutter-5.0.5.tar.gz
/vidcutter-5.5.0.tar.gz
+/vidcutter-6.0.0.tar.gz
diff --git a/sources b/sources
index 572e7af..ac86c8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef55a5d22396d6c31a4ca7a8e29b1144 vidcutter-5.5.0.tar.gz
+d97697735f59f1b6893b7420e9b2610d vidcutter-6.0.0.tar.gz
diff --git a/vidcutter.spec b/vidcutter.spec
index d1eb963..fb6fa13 100644
--- a/vidcutter.spec
+++ b/vidcutter.spec
@@ -1,8 +1,9 @@
%global unique_name com.ozmartians
+%global rname VidCutter
Name: vidcutter
-Version: 5.5.0
-Release: 3%{?dist}
+Version: 6.0.0
+Release: 1%{?dist}
Summary: The simplest + fastest video cutter & joiner
License: GPLv3+
Url: http://vidcutter.ozmartians.com
@@ -42,30 +43,32 @@ sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/python3|g' vidcutter/libs/*.py
%install
%py3_install
# E: non-executable-script
-for file in %{buildroot}%{python3_sitearch}/vidcutter/{__init__,__main__,about,graphicseffects,mediainfo,mediastream,settings,updater,videoconsole,videocutter,videolist,videoslider,videosliderwidget,videostyle,libs/config,libs/mpvwidget,libs/munch,libs/notifications,libs/singleapplication,libs/taskbarprogress,libs/videoservice,libs/widgets}.py; do
+for file in %{buildroot}%{python3_sitearch}/vidcutter/{__init__,__main__,about,changelog,mediainfo,mediastream,settings,updater,videoconsole,videocutter,videolist,videoslider,videosliderwidget,videostyle,libs/ffmetadata,libs/graphicseffects,libs/config,libs/mpvwidget,libs/munch,libs/notifications,libs/singleapplication,libs/taskbarprogress,libs/videoservice,libs/widgets}.py; do
chmod a+x $file
done
+rm -f %{buildroot}%{_datadir}/doc/vidcutter/LICENSE
+
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/{appdata,metainfo}/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
%files
%license LICENSE
-%doc README.md
+%doc README.md CHANGELOG
%{_bindir}/%{name}
%{python3_sitearch}/%{name}
%{python3_sitearch}/vidcutter-*-py?.?.egg-info
-%{_datadir}/applications/%{unique_name}.%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/mime/packages/x-vidcutter.xml
-%{_datadir}/mime/packages/wtv.xml
-%{_datadir}/appdata/%{unique_name}.%{name}.appdata.xml
-%{_datadir}/metainfo/%{unique_name}.%{name}.appdata.xml
-%{_datadir}/pixmaps/%{name}.svg
+%{_datadir}/applications/%{unique_name}.%{rname}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{unique_name}.%{rname}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{unique_name}.%{rname}.svg
+%{_datadir}/metainfo/%{unique_name}.%{rname}.appdata.xml
+%{_datadir}/mime/packages/%{unique_name}.%{rname}.xml
%changelog
+* Fri Jun 29 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 6.0.0-1
+- Update to 6.0.0
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 5.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
5 years, 10 months
[vice] Switch to GTK3 and SDL2 backends (Bernie Innocenti)
by jwrdegoede
commit de1d427fc1c5570ab39ce7bb16621fe2349d12a8
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jun 28 18:44:48 2018 +0200
Switch to GTK3 and SDL2 backends (Bernie Innocenti)
And fix builds on ppc64 (me)
vice.spec | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/vice.spec b/vice.spec
index 9a418d4..7cba91c 100644
--- a/vice.spec
+++ b/vice.spec
@@ -25,27 +25,22 @@ Patch1: vice-2.4.24-datadir.patch
Patch2: vice-htmlview.patch
Patch3: vice-norpath.patch
Patch4: vice-new-ffmpeg.patch
-BuildRequires: libXt-devel
+BuildRequires: gtk3-devel
+BuildRequires: SDL2-devel
BuildRequires: libXext-devel
-BuildRequires: libXxf86vm-devel
-BuildRequires: libXxf86dga-devel
BuildRequires: libXrandr-devel
BuildRequires: giflib-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: libgnomeui-devel
-BuildRequires: gtkglext-devel
-BuildRequires: vte-devel
BuildRequires: ffmpeg-devel
+BuildRequires: x264-devel
BuildRequires: lame-devel
BuildRequires: readline-devel
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
-BuildRequires: libieee1284-devel
BuildRequires: libpcap-devel
BuildRequires: bison
BuildRequires: flex
+BuildRequires: perl
BuildRequires: gettext
BuildRequires: info
BuildRequires: xa
@@ -169,15 +164,19 @@ export toolchain_check=no
export CC=gcc
export CXX=g++
+# Some of the code uses GNU / XOPEN libc extensions
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1"
+
pushd %{name}-%{version}.gtk
- %configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS
+ %configure --enable-native-gtk3ui $COMMON_FLAGS
# Ensure the system versions of these are used
rm -r src/lib/lib* src/lib/ffmpeg
%make_build
popd
pushd %{name}-%{version}.sdl
- %configure --enable-sdlui $COMMON_FLAGS
+ %configure --enable-sdlui2 $COMMON_FLAGS
# Ensure the system versions of these are used
rm -r src/lib/lib* src/lib/ffmpeg
%make_build
@@ -202,7 +201,8 @@ pushd %{name}-%{version}.sdl
popd
popd
-%find_lang %{name}
+#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*
@@ -263,7 +263,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%files common -f %{name}.lang
+%files common
%doc %{name}-%{version}.gtk/AUTHORS %{name}-%{version}.gtk/ChangeLog
%doc %{name}-%{version}.gtk/FEEDBACK %{name}-%{version}.gtk/README
%doc %{name}-%{version}.gtk/doc/iec-bus.txt
@@ -316,6 +316,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Thu Jun 28 2018 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.2-1
- New upstream release 3.2 (rfbz #4950)
+- Use new GTK3 UI instead of GTK2 (Bernie Innocenti)
+- Use SDL2 instead of SDL for .sdl versions (Bernie Innocenti)
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
5 years, 10 months
[vice] New upstream release 3.2 (rfbz #4950)
by jwrdegoede
commit 41f18754ccd37c9b2db75e1f6f7a7b836d17d64a
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jun 28 17:41:54 2018 +0200
New upstream release 3.2 (rfbz #4950)
.gitignore | 1 +
sources | 2 +-
vice-htmlview.patch | 10 +++++-----
vice-new-ffmpeg.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
vice-norpath.patch | 10 +++++-----
vice.spec | 12 +++++++++---
6 files changed, 70 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9339a8..db7efba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ vice-2.4.tar.gz
vice-2.4.24.tar.gz
vice-2.4.28.tar.gz
/vice-3.1.tar.gz
+/vice-3.2.tar.gz
diff --git a/sources b/sources
index 2df2c89..811b1be 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-f9018ca464b863da0bb1a82c56374432 vice-3.1.tar.gz
+58ba6b6653097898e059e0194615705a vice-3.2.tar.gz
a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
diff --git a/vice-htmlview.patch b/vice-htmlview.patch
index 89270c5..34406f0 100644
--- a/vice-htmlview.patch
+++ b/vice-htmlview.patch
@@ -1,8 +1,8 @@
-diff -ru vice-2.4.24.orig/src/arch/unix/x11/ui-resources.c vice-2.4.24.new/src/arch/unix/x11/ui-resources.c
---- vice-2.4.24.orig/src/arch/unix/x11/ui-resources.c 2015-07-26 18:00:51.000000000 +0200
-+++ vice-2.4.24.new/src/arch/unix/x11/ui-resources.c 2016-01-30 16:41:47.478138264 +0100
-@@ -172,7 +172,7 @@
- #ifdef MACOSX_SUPPORT
+diff -up vice-3.2/src/arch/unix/x11/ui-resources.c.htmlview vice-3.2/src/arch/unix/x11/ui-resources.c
+--- vice-3.2/src/arch/unix/x11/ui-resources.c.htmlview 2018-06-28 16:45:31.277140071 +0200
++++ vice-3.2/src/arch/unix/x11/ui-resources.c 2018-06-28 16:46:40.220627630 +0200
+@@ -183,7 +183,7 @@ static int set_confirm_on_exit(int val,
+ #ifdef MACOSX_SUPPORT
#define HTML_BROWSER_COMMAND_DEFAULT "/usr/bin/open %s"
#else
-#define HTML_BROWSER_COMMAND_DEFAULT "firefox %s"
diff --git a/vice-new-ffmpeg.patch b/vice-new-ffmpeg.patch
new file mode 100644
index 0000000..8c94f19
--- /dev/null
+++ b/vice-new-ffmpeg.patch
@@ -0,0 +1,49 @@
+diff -up vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c.ffmpeg vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c
+--- vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c.ffmpeg 2018-06-28 17:11:46.602748172 +0200
++++ vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c 2018-06-28 17:17:10.132040705 +0200
+@@ -360,7 +360,7 @@ static int ffmpegdrv_open_audio(AVFormat
+ }
+
+ audio_is_open = 1;
+- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
++ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
+ audio_inbuf_samples = 10000;
+ } else {
+ audio_inbuf_samples = c->frame_size;
+@@ -454,7 +454,7 @@ static int ffmpegmovie_init_audio(int sp
+
+ /* Some formats want stream headers to be separate. */
+ if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ /* create resampler context */
+ #ifndef HAVE_FFMPEG_AVRESAMPLE
+@@ -787,7 +787,7 @@ static void ffmpegdrv_init_video(screens
+
+ /* Some formats want stream headers to be separate. */
+ if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
+
+ if (audio_init_done) {
+@@ -967,17 +967,7 @@ static int ffmpegdrv_record(screenshot_t
+
+ video_st.frame->pts = video_st.next_pts++;
+
+- if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
+- AVPacket pkt;
+- VICE_P_AV_INIT_PACKET(&pkt);
+- pkt.flags |= AV_PKT_FLAG_KEY;
+- pkt.stream_index = video_st.st->index;
+- pkt.data = (uint8_t*)video_st.frame;
+- pkt.size = sizeof(AVPicture);
+- pkt.pts = pkt.dts = video_st.frame->pts;
+-
+- ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
+- } else {
++ {
+ AVPacket pkt = { 0 };
+ int got_packet;
+
diff --git a/vice-norpath.patch b/vice-norpath.patch
index d5f84de..90ec009 100644
--- a/vice-norpath.patch
+++ b/vice-norpath.patch
@@ -1,7 +1,7 @@
-diff -up vice-3.1/configure vice-3.1/configure.norpath
---- vice-3.1/configure 2017-03-30 22:40:32.000000000 +0200
-+++ vice-3.1/configure.norpath 2017-05-01 22:51:24.594241129 +0200
-@@ -25531,10 +25531,6 @@ _ACEOF
+diff -up vice-3.2/configure.norpath vice-3.2/configure
+--- vice-3.2/configure.norpath 2018-06-28 16:47:56.050161040 +0200
++++ vice-3.2/configure 2018-06-28 16:49:02.342582313 +0200
+@@ -26166,10 +26166,6 @@ _ACEOF
@@ -9,6 +9,6 @@ diff -up vice-3.1/configure vice-3.1/configure.norpath
-rpath_line=`${CONFIG_SHELL-/bin/sh} "$srcdir/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/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/arch/Makefile src/arch/amigaos/Makefile 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_x64/Makefile src/arch/android/AnVICE/jni/vice_x64_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_dtv_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_sc/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_128/Makefile s
rc/arch/android/AnVICE/jni/vice_x64_sc_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2/Makefile src/arch/andr
oid/AnVICE/jni/vice_x64_sc_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x128_2_5x0_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_5x0/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Ma
kefile 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/arch/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/gtk3/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/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/sortix-files/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arc
h/unix/Makefile src/arch/unix/gui/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/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/buildtools/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/diag/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/hwsiddrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/iodrv/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/mididrv/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 sr
c/serial/Makefile src/sid/Makefile src/socketdrv/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 src/vice-version.sh po/Makefile.in"
+ 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/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/arch/Makefile src/arch/amigaos/Makefile 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_x64/Makefile src/arch/android/AnVICE/jni/vice_x64_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_dtv_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_sc/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_128/Makefile s
rc/arch/android/AnVICE/jni/vice_x64_sc_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2/Makefile src/arch/andr
oid/AnVICE/jni/vice_x64_sc_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x128_2_5x0_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_5x0/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Ma
kefile 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/arch/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/gtk3/Makefile src/arch/gtk3/widgets/Makefile src/arch/gtk3/widgets/base/Makefile src/arch/msdos/Makefile src/arch/sdl/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/sortix-files/Makefile src/arch/sdl/syllable-files/Makefile src/arch/unix/Makefile src/arch/unix/gui/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/win32/Makefile src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/mingw32/wpcap/Makefile src/arch/win32/mingw32/wpcap/net/Makefile src/arch/win32/utils/Makefile src/buildtools/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/diag/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dc
r/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/hwsiddrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/iodrv/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/mididrv/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/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/socketdrv/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 src/vice-version.sh po/Makefile.in"
cat >confcache <<\_ACEOF
diff --git a/vice.spec b/vice.spec
index 922d17c..9a418d4 100644
--- a/vice.spec
+++ b/vice.spec
@@ -1,6 +1,6 @@
Name: vice
-Version: 3.1
-Release: 2%{?dist}
+Version: 3.2
+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-new-ffmpeg.patch
BuildRequires: libXt-devel
BuildRequires: libXext-devel
BuildRequires: libXxf86vm-devel
@@ -47,6 +48,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: gettext
BuildRequires: info
+BuildRequires: xa
BuildRequires: desktop-file-utils
BuildRequires: xorg-x11-font-utils
BuildRequires: libappstream-glib
@@ -147,6 +149,7 @@ sed -i 's/\r//' `find -name "*.cc"`
%patch1 -p1 -z .datadir
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .norpath
+%patch4 -p1 -z .ffmpeg
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
@@ -159,7 +162,7 @@ cp -a %{name}-%{version}.gtk %{name}-%{version}.sdl
%build
-COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch"
+COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch --enable-external-ffmpeg"
# workaround needed to fix incorrect toolchain check in configure script
export toolchain_check=no
@@ -311,6 +314,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Jun 28 2018 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.2-1
+- New upstream release 3.2 (rfbz #4950)
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
5 years, 10 months
[mpv] Revert last commit
by Leigh Scott
commit 3604a5bc3a1286ab5b90eb01a231508a630e6b4a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jun 27 13:39:10 2018 +0100
Revert last commit
mpv.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index aea76aa..28c68a2 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.28.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -45,9 +45,7 @@ BuildRequires: pkgconfig(rubberband)
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(uchardet) >= 0.0.5
BuildRequires: pkgconfig(vdpau)
-%ifarch x86_64 i686
BuildRequires: pkgconfig(vulkan)
-%endif
BuildRequires: waf
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
@@ -151,6 +149,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.2-6
+- Revert last commit
+
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.2-5
- Rebuild for new libass version
- vulkan is x86 only
5 years, 10 months
[vlc] Revert last commit
by Leigh Scott
commit bc3b86d04b3b18fb3013c93b7f7a1ab9b18af81d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jun 27 13:32:36 2018 +0100
Revert last commit
vlc.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 8b9cf78..9ee0e69 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -123,9 +123,7 @@ BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
BuildRequires: pkgconfig(libjpeg)
-%ifarch x86_64 i686
BuildRequires: pkgconfig(libplacebo)
-%endif
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -567,6 +565,9 @@ fi || :
%changelog
+* Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-5
+- Revert last commit
+
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-4
- Rebuild for new libass version
- Make libplacebo x86 only due to vulkan changes
5 years, 10 months
[xpra-codecs-freeworld] Update to 2.3.2
by Antonio
commit a48aa7989ba0913e2fd384ed14ca6aa95adf5a51
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Jun 27 14:27:51 2018 +0200
Update to 2.3.2
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9394e8..8499ecd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ xpra-0.16.3.tar.xz
/xpra-2.2.6.tar.xz
/xpra-2.3.tar.xz
/xpra-2.3.1.tar.xz
+/xpra-2.3.2.tar.xz
diff --git a/sources b/sources
index e2d0f5e..b38fccb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f95844aae43fd33878b60d80da360d5c xpra-2.3.1.tar.xz
+67ae262de9c7175c14d2a1fb24dad1a1 xpra-2.3.2.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index f42cc62..7d8ab11 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -35,8 +35,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -128,6 +128,9 @@ find %{buildroot}%{pythonx_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Wed Jun 27 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.3.2-1
+- Update to 2.3.2
+
* Sun Jun 24 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.3.1-2
- Define build conditions for debugging
- Switch back to Python2 (see xpra.org/trac/ticket/1885) (bz#1583319)
5 years, 10 months
