[vlc] Update to 3.0.0 release
by Leigh Scott
commit 65ce92654aae0b0dd2b86d6eb4bd8cc5d2f9f354
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 9 13:22:43 2018 +0000
Update to 3.0.0 release
...-lua-don-t-call-directly-config_GetLibDir.patch | 38 ----
...-Revert-qt-add-Wayland-run-time-detection.patch | 191 ---------------------
0001-qt-Prefer-XCB-over-Wayland.patch | 43 -----
disable_hidpi_scaling.patch | 14 --
sources | 2 +-
vlc.spec | 13 +-
6 files changed, 8 insertions(+), 293 deletions(-)
---
diff --git a/sources b/sources
index 828dc72..60c16f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d3e779564f2381341c1eb14cb6133f6 vlc-3.0.0-20180202-0233-rc9.tar.xz
+a953d8b90e56f06828c4ca8e390c5c9b vlc-3.0.0.tar.xz
diff --git a/vlc.spec b/vlc.spec
index ca57768..2c261cc 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,7 +1,7 @@
%global vlc_vers 3.0.0
-%global vlc_date 20180202
-%global vlc_rc rc9
-%global vlc_tag -%{?vlc_date}-0233-%{?vlc_rc}
+#global vlc_date 20180202
+#global vlc_rc rc9
+#global vlc_tag -%%{?vlc_date}-0233-%%{?vlc_rc}
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 0.53%{?vlc_date:.git%{vlc_date}}%{?vlc_rc:.%{vlc_rc}}%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -271,8 +271,6 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%build
-
-
%configure \
--disable-dependency-tracking \
--disable-optimizations \
@@ -548,6 +546,9 @@ fi || :
%changelog
+* Fri Feb 09 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-1
+- Update to 3.0.0 release
+
* Sun Feb 04 2018 Sérgio Basto <sergio(a)serjux.com> - 3.0.0-0.53.git20180202.rc9
- Rebuild (live555-2018.01.29)
6 years, 7 months
[vlc] Minor updates
by Nicolas Chauvet
commit 0d6a7d36a62b5ccc0cf0172b5fd2bee1d59dff57
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 8 23:06:04 2018 +0100
Minor updates
vlc.spec | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index a985f45..ca57768 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -51,6 +51,7 @@ Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
+BuildRequires: fontpackages-devel
%{?_with_bootstrap:
BuildRequires: bison
@@ -70,7 +71,6 @@ BuildRequires: pkgconfig(dbus-1)
BuildRequires: flac-devel
%{?_with_fluidsynth:BuildRequires: fluidsynth-devel}
BuildRequires: fribidi-devel
-%{?_with_gnomevfs:BuildRequires: gnome-vfs2-devel}
BuildRequires: gnutls-devel >= 1.0.17
BuildRequires: gsm-devel
BuildRequires: hostname
@@ -186,6 +186,12 @@ BuildRequires: pkgconfig(xcb-keysyms)
}
BuildRequires: xorg-x11-proto-devel
+%ifarch armv7hl
+%{?_with_rpi:
+BuildRequires: raspberrypi-vc-devel
+}
+%endif
+
%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer}
@@ -283,14 +289,12 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%{?_with_live555:--enable-live555} \
%{?_with_opencv:--enable-opencv} \
--enable-sftp \
-%{?_with_gnomevfs:--enable-gnomevfs} \
%{?_with_vcdimager:--enable-vcdx} \
--enable-omxil \
--enable-omxil-vout \
%{?_with_rpi:
--enable-rpi-omxil \
- --enable-mmal-codec \
- --enable-mmal-vout \
+ --enable-mmal \
} \
%{!?_with_a52dec:--disable-a52} \
%{!?_with_ffmpeg:--disable-avcodec --disable-avformat \
6 years, 7 months
[obs-studio] Fix scriptlets
by Leigh Scott
commit 0d9eaa67b39b0c2fb99fbe67ff8b09eccf16e5a6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Feb 8 19:04:44 2018 +0000
Fix scriptlets
obs-studio.spec | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 3ff4ec1..9e98708 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,6 +1,6 @@
Name: obs-studio
Version: 21.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -12,7 +12,8 @@ Patch0: obs-ffmpeg-mux.patch
ExclusiveArch: i686 x86_64
BuildRequires: gcc-objc
-BuildRequires: cmake
+BuildRequires: cmake3
+BuildRequires: ninja-build
BuildRequires: libX11-devel
BuildRequires: mesa-libGL-devel
BuildRequires: ffmpeg-devel
@@ -72,14 +73,14 @@ that use %{name}.
sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' cmake/Modules/ObsHelpers.cmake
%build
-%cmake -DOBS_VERSION_OVERRIDE=%{version} -DUNIX_STRUCTURE=1
-%make_build
+%cmake3 -DOBS_VERSION_OVERRIDE=%{version} -DUNIX_STRUCTURE=1 -GNinja
+%ninja_build
# build docs
doxygen
%install
-%make_install
+%ninja_install
mkdir -p %{buildroot}/%{_libexecdir}/obs-plugins/obs-ffmpeg/
mv -f %{buildroot}/%{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \
@@ -88,21 +89,7 @@ mv -f %{buildroot}/%{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \
%check
/usr/bin/desktop-file-validate %{buildroot}/%{_datadir}/applications/obs.desktop
-%post libs -p /sbin/ldconfig
-
-%post
-/usr/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
- /usr/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-fi
-
-%postun libs -p /sbin/ldconfig
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+%ldconfig_scriptlets libs
%files
%doc README.rst
@@ -128,6 +115,10 @@ fi
%changelog
+* Thu Feb 08 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 21.0.2-2
+- Fix scriptlets
+- Use ninja to build
+
* Wed Feb 07 2018 Momcilo Medic <fedorauser(a)fedoraproject.org> - 21.0.2-1
- Updated to 21.0.2
6 years, 7 months
[mpv] Fix missing build requires
by Leigh Scott
commit 33a6ce6fcdabd927061acf40c3e8eacbfad82b5b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Feb 8 13:14:11 2018 +0000
Fix missing build requires
mpv.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index d3285e1..cd52376 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -50,6 +50,7 @@ BuildRequires: waf
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-egl)
+BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
@@ -127,9 +128,7 @@ waf install --destdir=%{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files
%docdir %{_docdir}/%{name}
@@ -152,6 +151,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Thu Feb 08 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.0-3
+- Fix missing build requires
+
* Sat Jan 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.0-2
- Rebuild for libcdio
6 years, 7 months
[obs-studio/f27] (3 commits) ...Updated to 21.0.2
by Momcilo Medic
Summary of changes:
26c04b2... Mass rebuild for x264 and x265 (*)
360ee92... Rebuilt for ffmpeg-3.5 git (*)
6b9ca3f... Updated to 21.0.2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[obs-studio/f26] (3 commits) ...Updated to 21.0.2
by Momcilo Medic
Summary of changes:
26c04b2... Mass rebuild for x264 and x265 (*)
360ee92... Rebuilt for ffmpeg-3.5 git (*)
6b9ca3f... Updated to 21.0.2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[obs-studio] Updated to 21.0.2
by Momcilo Medic
commit 6b9ca3f397f07ae6c950ea594580f6ea88b75b07
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Feb 7 22:39:57 2018 +0100
Updated to 21.0.2
obs-studio.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 8d99d93..3ff4ec1 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,6 +1,6 @@
Name: obs-studio
-Version: 20.1.3
-Release: 3%{?dist}
+Version: 21.0.2
+Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -128,6 +128,9 @@ fi
%changelog
+* Wed Feb 07 2018 Momcilo Medic <fedorauser(a)fedoraproject.org> - 21.0.2-1
+- Updated to 21.0.2
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 20.1.3-3
- Rebuilt for ffmpeg-3.5 git
diff --git a/sources b/sources
index c893cc4..b0a44e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f62a84786c3d0072a0e943657e9dfe9 obs-studio-20.1.3.tar.gz
+081c059f7ed017e0a645a4faec606ef0 obs-studio-21.0.2.tar.gz
6 years, 7 months
[xv] add patch
by Leigh Scott
commit 4eb95723f36f626c9c3a7d51e8d3de14b2ecbde1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 7 14:11:52 2018 +0000
add patch
xv-3.10a-signal.patch | 341 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 341 insertions(+)
---
diff --git a/xv-3.10a-signal.patch b/xv-3.10a-signal.patch
new file mode 100644
index 0000000..6966085
--- /dev/null
+++ b/xv-3.10a-signal.patch
@@ -0,0 +1,341 @@
+--- Imakefile
++++ Imakefile 2008-05-23 13:21:23.000000000 +0200
+@@ -150,7 +150,7 @@ SYS_LIBRARIES= -lm
+
+
+ DEPLIBS = $(LIBJPEG) $(LIBTIFF)
+-LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS)
++LOCAL_LIBRARIES = $(XLIB) $(XTOOLLIB) $(DEPLIBS)
+
+ DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
+ $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
+--- xv.c
++++ xv.c 2008-05-23 13:03:36.000000000 +0200
+@@ -159,6 +159,8 @@ static int curstype, stdinflag, browseM
+ static int nodecor;
+ static double gamval, rgamval, ggamval, bgamval;
+
++XtAppContext context;
++
+ /*******************************************/
+ int main(argc, argv)
+ int argc;
+@@ -173,6 +175,12 @@ int main(argc, argv)
+ Window rootReturn, parentReturn, *children;
+ unsigned int numChildren, rootDEEP;
+
++#ifdef AUTO_EXPAND
++ signal(SIGHUP, SIG_IGN);
++#endif
++#ifndef NOSIGNAL
++ signal(SIGQUIT, SIG_IGN);
++#endif
+
+ #ifdef VMS
+ /* convert VMS-style arguments to unix names and glob */
+@@ -279,11 +279,6 @@ int main(argc, argv)
+ if (!tmpdir) FatalError("can't malloc 'tmpdir'\n");
+ strcpy(tmpdir, tmpstr);
+
+-#ifdef AUTO_EXPAND
+- Vdinit();
+- vd_handler_setup();
+-#endif
+-
+ /* init command-line options flags */
+ infogeom = DEFINFOGEOM; ctrlgeom = DEFCTRLGEOM;
+ gamgeom = DEFGAMGEOM; browgeom = DEFBROWGEOM;
+@@ -378,7 +383,10 @@ int main(argc, argv)
+ parseResources(argc,argv);
+ parseCmdLine(argc, argv);
+ verifyArgs();
++#ifdef AUTO_EXPAND
++ Vdinit();
++ vd_handler_setup();
++#endif
+-
+
+ #if 0
+ #ifdef XVEXECPATH
+@@ -1245,6 +1253,10 @@ static void parseResources(argc, argv)
+ exit(1);
+ }
+
++ i = 0;
++ XtToolkitInitialize();
++ context = XtCreateApplicationContext();
++ XtDisplayInitialize(context, theDisp, NULL, "XV", NULL, 0, &i, argv);
+
+
+ if (rd_str ("aspect")) {
+--- xv.h
++++ xv.h 2008-05-23 12:25:12.000000000 +0200
+@@ -1946,10 +1946,6 @@ int Rmvdir PARM((char *)
+ int Movevdir PARM((char *, char *));
+ int Isarchive PARM((char *));
+ int Isvdir PARM((char *));
+-void vd_HUPhandler PARM((void));
+-void vd_handler PARM((int));
+-int vd_Xhandler PARM((Display *, XErrorEvent *));
+-int vd_XIOhandler PARM((Display *));
+ void vd_handler_setup PARM((void));
+
+
+--- xvevent.c
++++ xvevent.c 2008-05-23 12:18:44.000000000 +0200
+@@ -58,6 +58,7 @@ static void CropKey PARM((int
+ static void TrackPicValues PARM((int, int));
+ static int CheckForConfig PARM((void));
+ static Bool IsConfig PARM((Display *, XEvent *, char *));
++static void QuitOnInterrupt PARM((XtPointer dummy, XtSignalId* Id));
+ static void onInterrupt PARM((int));
+
+ static void Paint PARM((void));
+@@ -74,6 +75,11 @@ static void annotatePic PARM((voi
+ static int debkludge_offx;
+ static int debkludge_offy;
+
++#ifndef NOSIGNAL
++static XtSignalId IdQuit = 0;
++extern XtAppContext context;
++#endif
++
+ /****************/
+ int EventLoop()
+ /****************/
+@@ -90,6 +96,9 @@ int EventLoop()
+
+
+ #ifndef NOSIGNAL
++ if (IdQuit)
++ XtRemoveSignal(IdQuit);
++ IdQuit = XtAppAddSignal(context, QuitOnInterrupt, NULL);
+ signal(SIGQUIT, onInterrupt);
+ #endif
+
+@@ -140,7 +149,11 @@ int EventLoop()
+ in real-time (polling, flashing the selection, etc.) get next event */
+ if ((waitsec<0.0 && !polling && !HaveSelection()) || XPending(theDisp)>0)
+ {
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &event);
++#else
+ XNextEvent(theDisp, &event);
++#endif
+ retval = HandleEvent(&event,&done);
+ }
+
+@@ -2681,8 +2694,7 @@ int xvErrorHandler(disp, err)
+
+
+ /************************************************************************/
+-static void onInterrupt(i)
+- int i;
++static void QuitOnInterrupt(XtPointer dummy, XtSignalId* Id)
+ {
+ /* but first, if any input-grabbing popups are active, we have to 'cancel'
+ them. */
+@@ -2727,6 +2739,10 @@ static void onInterrupt(i)
+ frominterrupt = 1;
+ }
+
++static void onInterrupt(int i)
++{
++ XtNoticeSignal(IdQuit);
++}
+
+
+
+--- xvgrab.c
++++ xvgrab.c 2008-05-26 14:06:49.591033050 +0200
+@@ -69,6 +69,10 @@ static int CountColors24 PARM((
+ static int Trivial24to8 PARM((byte *, int, int, byte *,
+ byte *, byte *, byte *, int));
+
++#ifndef NOSIGNAL
++extern XtAppContext context;
++#endif
++
+ /***********************************/
+ int Grab()
+ {
+@@ -113,7 +117,11 @@ int Grab()
+ if (t >= startT + grabDelay) break;
+ if (XPending(theDisp)>0) {
+ XEvent evt;
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &evt);
++#else
+ XNextEvent(theDisp, &evt);
++#endif
+ i = HandleEvent(&evt, &done);
+ if (done) { /* only 'new image' cmd accepted=quit */
+ if (i==QUIT) Quit(0);
+@@ -175,7 +183,11 @@ int Grab()
+ }
+
+ /* continue to handle events while waiting... */
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &evt);
++#else
+ XNextEvent(theDisp, &evt);
++#endif
+ i = HandleEvent(&evt, &done);
+ if (done) { /* only 'new image' cmd accepted=quit */
+ if (i==QUIT) {
+@@ -365,7 +377,11 @@ int Grab()
+ state = 0;
+ while (state != 3) {
+ XEvent event;
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &event);
++#else
+ XNextEvent(theDisp, &event);
++#endif
+ HandleEvent(&event, &i);
+
+ if (!(state&1) && event.type == MapNotify &&
+--- xvpcd.c
++++ xvpcd.c 2008-05-26 14:08:19.428156862 +0200
+@@ -114,6 +114,10 @@ static byte Y[351] = {
+ 255
+ };
+
++#ifndef NOSIGNAL
++extern XtAppContext context;
++#endif
++
+ /*******************************************/
+ /* The size should be -1 for the popup to ask otherwise fast is assumed */
+ /* returns '1' on success */
+@@ -259,7 +263,11 @@ data for 16 base:
+ while (leaveitup) {
+ int i;
+ XEvent event;
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &event);
++#else
+ XNextEvent(theDisp, &event);
++#endif
+ HandleEvent(&event, &i);
+ }
+ /* At this point goforit and size will have been set */
+--- xvpic2.c
++++ xvpic2.c 2008-05-26 14:09:26.354952942 +0200
+@@ -321,6 +321,10 @@ struct _form_tab {
+ #define P2BM 2
+ #define P2BI 3
+
++#ifndef NOSIGNAL
++extern XtAppContext context;
++#endif
++
+ /* The main routine to load a PIC2 file. */
+ int LoadPIC2(fname, pinfo, quick)
+ char *fname;
+@@ -3541,7 +3545,11 @@ int cmd;
+ x_offset = atoi(x_offsetp);
+ y_offset = atoi(y_offsetp);
+
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &event);
++#else
+ XNextEvent(theDisp, &event);
++#endif
+ HandleEvent(&event, &i);
+
+ writePIC2();
+--- xvpopup.c
++++ xvpopup.c 2008-05-26 14:10:21.880590702 +0200
+@@ -130,6 +130,9 @@ static int padLoadLen = 0;
+ static const char *padLoadNames[PAD_MAXDEFLEN];
+ static const char *padLoadVals [PAD_MAXDEFLEN];
+
++#ifndef NOSIGNAL
++extern XtAppContext context;
++#endif
+
+ /***************************************************/
+ void CenterMapWindow(win, dx, dy, w, h)
+@@ -311,7 +314,11 @@ static int doPopUp(txt, labels, n, popty
+
+ /* block until this window gets closed */
+ while (popUp) {
++#ifndef NOSIGNAL
++ XtAppNextEvent(context, &event);
++#else
+ XNextEvent(theDisp, &event);
++#endif
+ HandleEvent(&event, &i);
+ }
+
+--- xvvd.c
++++ xvvd.c 2008-05-26 14:02:00.241635107 +0200
+@@ -26,6 +26,11 @@ static int vd_UncompressFile PARM((ch
+ static int vd_tarc PARM((char *));
+ static u_int vd_tar_sumchk PARM((char *));
+
++static XtSignalId IdHup = 0;
++static XtSignalId IdInt = 0;
++static int UsedSignal = 0;
++extern XtAppContext context;
++
+ #define VD_VDTABLESIZE 100
+
+ #define VD_ERR -2
+@@ -1041,7 +1046,15 @@ char *prog, *mode;
+ * If XV end by C-c, there are dust of directory which name is .xvvd???,
+ * made by xvvd. Then, I handle SIGINT, and add good finish.
+ */
+-void vd_HUPhandler()
++static void vd_HUPhandler(int sig)
++{
++ XtNoticeSignal(IdHup);
++#if defined(SYSV) || defined(SVR4) || defined(__USE_XOPEN_EXTENDED)
++ signal(SIGHUP, (void (*)PARM((int))) vd_HUPhandler);
++#endif
++}
++
++static void HUPhandler(XtPointer dummy, XtSignalId* Id)
+ {
+ #if defined(SYSV) || defined(SVR4) || defined(__USE_XOPEN_EXTENDED)
+ sighold(SIGHUP);
+@@ -1054,19 +1067,23 @@ void vd_HUPhandler()
+
+ #if defined(SYSV) || defined(SVR4) || defined(__USE_XOPEN_EXTENDED)
+ sigrelse(SIGHUP);
+- signal(SIGHUP, (void (*)PARM((int))) vd_HUPhandler);
+ #else
+ sigsetmask(mask);
+ #endif
+ }
+
+-void vd_handler(sig)
+-int sig;
++static void vd_handler(int sig)
++{
++ UsedSignal = sig;
++ XtNoticeSignal(IdInt);
++}
++
++static void INThandler(XtPointer dummy, XtSignalId* Id)
+ {
+ #if defined(SYSV) || defined(SVR4) || defined(__USE_XOPEN_EXTENDED)
+- sighold(sig);
++ sighold(UsedSignal);
+ #else
+- sigblock(sigmask(sig));
++ sigblock(sigmask(UsedSignal));
+ #endif
+
+ Quit(1); /*exit(1);*/
+@@ -1091,6 +1108,9 @@ Display *disp;
+
+ void vd_handler_setup()
+ {
++ IdHup = XtAppAddSignal(context, HUPhandler, NULL);
++ IdInt = XtAppAddSignal(context, INThandler, NULL);
++
+ signal(SIGHUP, (void (*)PARM((int))) vd_HUPhandler);
+ signal(SIGINT, (void (*)PARM((int))) vd_handler);
+ signal(SIGTERM,(void (*)PARM((int))) vd_handler);
6 years, 7 months
[xv] Hopefully fix rfbz#3044
by Leigh Scott
commit 0061c1dbee1e4843c42851dc3e80c376c2a63853
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 7 14:09:11 2018 +0000
Hopefully fix rfbz#3044
xv.spec | 68 +++++++++++++++++++++++------------------------------------------
1 file changed, 24 insertions(+), 44 deletions(-)
---
diff --git a/xv.spec b/xv.spec
index 418d1dc..baff463 100644
--- a/xv.spec
+++ b/xv.spec
@@ -1,9 +1,9 @@
-%define vprog 3.10a
-%define vjumbo 20070520
+%global vprog 3.10a
+%global vjumbo 20070520
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 26%{?dist}
+Release: 27%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -34,18 +34,16 @@ Patch7: xv-3.10a-xvcut.patch
Patch8: xv-3.10a-format.patch
Patch9: xv-3.10a-png-itxt.patch
Patch10: xv-3.10a-smooth-fix2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils
-%if "%{?rhel}" != "4"
-BuildRequires: libX11-devel libXt-devel
-%global xlibdir %{_libdir}
-%else
-BuildRequires: xorg-x11-devel
-Requires: man
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-%global xlibdir /usr/X11R6/%{_lib}
-%endif
+Patch11: xv-3.10a-signal.patch
+
+BuildRequires: libtiff-devel
+BuildRequires: libpng-devel
+BuildRequires: jasper-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
+
+
Requires: hicolor-icon-theme
%description
@@ -114,9 +112,7 @@ RGB, XPM, Targa, XWD, PostScript(TM) та PM. Xv також вміє робит
%package doc
Summary: Manuals in various formats for the xv image viewer
Group: Documentation
-%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
BuildArch: noarch
-%endif
%description doc
Manuals in various formats for the xv image viewer, plus technical details
@@ -162,6 +158,10 @@ of the various image file formats supported.
# fix crash due to off-by-one smoothing bug
%patch10 -p1
+# Hopefully fix rfbz#3044
+%patch11 -p0
+
+
# Include permission to distribute
%{__install} -m 0644 -p %{SOURCE2} .
@@ -196,17 +196,15 @@ for doc in docs/manuals/xv*.ps; do
done
# Fix directory location of X libs
-%{__sed} -i -e 's@-L/usr/X11R6/lib[[:space:]]@-L%{xlibdir} @' Makefile
+%{__sed} -i -e 's@-L/usr/X11R6/lib[[:space:]]@-L%{_libdir} -lXt @' Makefile
%build
-%{__make} %{?_smp_mflags}
+%{make_build}
%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{make_install}
desktop-file-install \
- --vendor=livna \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE3}
@@ -241,28 +239,8 @@ do
%{__cp} -a ${doc} %{buildroot}%{_docdir}/%{name}-%{vprog}/
done
-%clean
-%{__rm} -rf %{buildroot}
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-update-desktop-database &> /dev/null || :
-
-%if "%{?rhel}" != "4"
-# EL-4 doesn't have %%posttrans, nor does it have an icon cache to maintain
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
%files
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{vprog}/BUGS
%doc %{_docdir}/%{name}-%{vprog}/CHANGELOG
%doc %{_docdir}/%{name}-%{vprog}/copyright.h
@@ -279,7 +257,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/xcmap
%{_bindir}/xv
%{_bindir}/xvpictoppm
-%{_datadir}/applications/livna-xv.desktop
+%{_datadir}/applications/xv.desktop
%{_datadir}/icons/hicolor/48x48/apps/xv.png
%{_mandir}/man1/bggen.1*
%{_mandir}/man1/vdcomp.1*
@@ -290,13 +268,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%lang(pl) %{_mandir}/pl/man1/xvpictoppm.1*
%files doc
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{vprog}/README.docs
%doc %{_docdir}/%{name}-%{vprog}/bigxv.jpg
%doc %{_docdir}/%{name}-%{vprog}/formats/
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Wed Feb 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.10a.jumbopatch.20070520-27
+- Hopefully fix rfbz#3044
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.10a.jumbopatch.20070520-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 7 months
[compat-ffmpeg28] Fix scriptlet
by Leigh Scott
commit b9a6bc6526045c2141e2b61d6dbdac4d0239ab03
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 7 09:34:12 2018 +0000
Fix scriptlet
compat-ffmpeg28.spec | 5 -----
1 file changed, 5 deletions(-)
---
diff --git a/compat-ffmpeg28.spec b/compat-ffmpeg28.spec
index 5d1d1bc..71ef33a 100644
--- a/compat-ffmpeg28.spec
+++ b/compat-ffmpeg28.spec
@@ -200,12 +200,7 @@ done
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.so
fi
-%if 0%{?fedora} >= 28
%ldconfig_scriptlets
-%else
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%endif
%files
%doc COPYING.* CREDITS README.md
6 years, 7 months