commit 1576a573339c6af44e78e28bace1f3ba82ba1c14
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 24 19:13:32 2024 +0100
- rediffed patches, dropped outdated/messed fix-keys patch
avifile-fix-keys.patch | 24 ------------------------
avifile-opt.patch | 8 ++++----
avifile.spec | 2 --
3 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/avifile.spec b/avifile.spec
index 961d565..886e85c 100644
--- a/avifile.spec
+++ b/avifile.spec
@@ -18,7 +18,6 @@ Source0:
https://downloads.sourceforge.net/avifile/%{name}-0.7-%{version}.tar.bz
# Source0-md5: 7da94802f120d1b69e04a13170dcd21d
Source1: %{name}.desktop
Patch0: %{name}-shareware.patch
-Patch1: %{name}-fix-keys.patch
Patch2: %{name}-etc_dir.patch
Patch3: %{name}-aviplay_h.patch
Patch4: %{name}-no_aux_dir.patch
@@ -348,7 +347,6 @@ Sterownik VIDIX dla kart graficznych ATI Rage128.
%setup -q -n %{name}-0.7-%{version}
%{__rm} -r ffmpeg m4/ffmpeg.m4
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
diff --git a/avifile-fix-keys.patch b/avifile-fix-keys.patch
deleted file mode 100644
index cdec159..0000000
--- a/avifile-fix-keys.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- avifile0.7-0.7.16/player/playercontrol.cpp~ Wed Sep 4 20:56:10 2002
-+++ avifile0.7-0.7.16/player/playercontrol.cpp Tue Nov 19 03:04:57 2002
-@@ -786,8 +786,8 @@
- case Qt::Key_End:
- player->ReseekExact(player->GetLengthTime() - 1.);
- return;
-- case Qt::Key_Down:
-- case Qt::Key_PageDown:
-+ case Qt::Key_Up:
-+ case Qt::Key_PageUp:
- {
- double sktime = (kevent->key() == Qt::Key_Down) ? 60. : 10.;
- double o = player->GetTime();
-@@ -803,8 +803,8 @@
- player->NextKeyFrame();
- }
- return;
-- case Qt::Key_Up:
-- case Qt::Key_PageUp:
-+ case Qt::Key_Down:
-+ case Qt::Key_PageDown:
- {
- double sktime = (kevent->key() == Qt::Key_Up) ? 60. : 10.;
- double p = player->GetTime() - sktime;
diff --git a/avifile-opt.patch b/avifile-opt.patch
index 516e25e..5362f79 100644
--- a/avifile-opt.patch
+++ b/avifile-opt.patch
@@ -1,6 +1,6 @@
---- avifile-0.7-0.7.38/configure.in.orig 2003-12-29 23:38:53.000000000
+0100
-+++ avifile-0.7-0.7.38/configure.in 2003-12-30 00:01:05.767775944 +0100
-@@ -898,10 +898,6 @@
+--- avifile-0.7-0.7.45/configure.in.orig 2024-11-17 22:12:31.962552188
+0100
++++ avifile-0.7-0.7.45/configure.in 2024-11-17 22:18:05.884647746 +0100
+@@ -908,10 +908,6 @@ if test x$enable_release != xyes -o x$en
dnl CFLAGS="-g $PROFFLAG"
dnl CXXFLAGS="-g $PROFFLAG"
dnl FFMPEG_CFLAGS="-g $PROFFLAG"
@@ -10,4 +10,4 @@
- FFMPEG_CFLAGS=`echo $FFMPEG_CFLAGS | sed s/-g//`
fi
- dnl lt_major_version=`libtool --version 2>&1 | sed 's/\(.*\
\)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\(\ .*\)/\2/'`
+ WIN32_CFLAGS=`echo $CFLAGS | sed s/-fomit-frame-pointer//g`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avifile.git/commitdiff/1576a573339c6af44e78e28bace1f3ba82ba1c14
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
