Commit 1a573579 authored by Luca Giambonini's avatar Luca Giambonini

gcc rebuild, group 4

parent 49653b46
......@@ -2,14 +2,13 @@
pkgname=aspell
pkgver=0.60.6.1
_pkgmajorver=0.60
pkgrel=3
pkgrel=4
pkgdesc="A spell checker designed to eventually replace Ispell"
url="http://aspell.net/"
arch=('x86_64')
license=('LGPL')
depends=('gcc-libs' 'ncurses')
optdepends=('perl: to import old dictionaries')
options=(!libtool)
install=aspell.install
source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('e66a9c9af6a60dc46134fdacf6ce97d7')
......
......@@ -2,7 +2,7 @@
pkgname=automoc4
pkgver=0.9.88
pkgrel=2
pkgrel=3
pkgdesc="KDE automoc4"
arch=('x86_64')
url='http://www.kde.org'
......
pkgname=dvgrab
pkgver=3.5
pkgrel=2
pkgrel=3
pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source"
arch=('x86_64')
url="http://www.kinodv.org"
......@@ -12,6 +12,7 @@ md5sums=('b39a242ce63e80fc347ab59931f75649')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
autoreconf -vi
./configure --prefix=/usr
make
}
......
pkgname=encfs
pkgver=1.9.2
pkgrel=2
pkgrel=3
pkgdesc='Encrypted filesystem in user-space'
arch=('x86_64')
url='https://vgough.github.io/encfs/'
......
......@@ -2,14 +2,13 @@
pkgname=fftw
pkgver=3.3.7
pkgrel=1
pkgrel=2
pkgdesc="A library for computing the discrete Fourier transform (DFT)"
arch=('x86_64')
license=('GPL2')
url="http://www.fftw.org/"
depends=('gcc-libs' 'bash')
makedepends=('gcc-fortran')
options=('!libtool')
source=(http://www.fftw.org/${pkgname}-${pkgver}.tar.gz)
install=fftw.install
sha1sums=('2ae980a8d44c161ce4a09c6e2d1c79243ecbabb2')
......
# maintainer almack@chakraos.org
# maintainer almack@chakralinux.org
pkgname=glu
pkgver=9.0.0
pkgrel=2
pkgrel=3
pkgdesc="Mesa OpenGL Utility library"
arch=('x86_64')
url="http://cgit.freedesktop.org/mesa/glu/"
......@@ -28,4 +28,4 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
}
\ No newline at end of file
}
pkgname=gptfdisk
pkgver=1.0.3
pkgrel=1
pkgrel=2
pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
arch=('x86_64')
url="http://www.rodsbooks.com/gdisk/"
......
pkgname=graphicsmagick
pkgver=1.3.25
pkgver=1.3.27
pkgrel=1
pkgdesc="Image processing system"
arch=('x86_64')
......@@ -9,7 +9,7 @@ makedepends=('perl')
depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'libsm' 'libpng'
'libtiff' 'libwmf' 'libxml2' 'libltdl' 'libxext' 'xz' 'perl')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
sha1sums=('0dcf4c1f6f3ead29147ea0392a148ce50cd64bb4')
sha1sums=('f334cfc6f03e6d4dfea8d9fe0643820649d20f7a')
build() {
cd "${srcdir}/GraphicsMagick-$pkgver"
......
pkgname=imagemagick
pkgver=6.9.4.7
pkgver=6.9.9.33
pkgrel=1
pkgdesc="An image viewing/manipulation program"
arch=('x86_64')
......@@ -17,11 +17,10 @@ optdepends=('ghostscript: for Ghostscript support'
'libpng: for PNG support'
'libwebp: for WEBP support')
options=('libtool' '!emptydirs')
source=(http://www.imagemagick.org/download/releases/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
'perlmagick.rpath.patch')
sha1sums=('d386de76334a7c1c13f40d337a0f38b18c4ca86c'
'SKIP'
'e143cf9d530fabf3b58023899b5cc544ba93daec')
source=(http://www.imagemagick.org/download/releases/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc})
sha1sums=('25e97ff67107ba9e8a45a9751153827244124e0d'
'SKIP')
validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae
backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
"etc/ImageMagick-${pkgver%%.*}/colors.xml"
"etc/ImageMagick-${pkgver%%.*}/delegates.xml"
......@@ -40,7 +39,6 @@ prepare() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
sed '/AC_PATH_XTRA/d' -i configure.ac
autoreconf --force --install
patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
}
build() {
......@@ -72,7 +70,7 @@ build() {
--without-fpx \
--without-gvc \
--without-jbig
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
......
pkgname=intel-tbb
pkgver=4.4.5
pkgver=2018_20171205
_pkgver=2018_U2
pkgrel=1
_pkgname=tbb44
_ver=20150728
pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.'
arch=('x86_64')
url='https://www.threadingbuildingblocks.org/'
license=('GPL')
depends=('gcc-libs')
source=("${url}/sites/default/files/software_releases/source/${_pkgname}_${_ver}oss_src.tgz")
md5sums=('2ef1d8cb790324c09aa17360d75dd619')
source=(https://github.com/01org/tbb/archive/$_pkgver.tar.gz)
sha256sums=('78bb9bae474736d213342f01fe1a6d00c6939d5c75b367e2e43e7bf29a6d8eca')
build() {
cd ${_pkgname}_${_ver}oss
cd tbb-$_pkgver
make
}
package() {
cd ${_pkgname}_${_ver}oss
cd tbb-$_pkgver
install -d ${pkgdir}/usr/lib
install -m755 build/linux_*/*.so* ${pkgdir}/usr/lib
......
pkgname=jack
pkgver=0.125.0
pkgrel=1
pkgrel=2
pkgdesc="A low-latency audio server"
arch=('x86_64')
license=('GPL2' 'custom:LGPL2')
......
......@@ -2,7 +2,7 @@
pkgname=ladspa
pkgver=1.13
pkgrel=12
pkgrel=13
pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
arch=('x86_64')
license=('LGPL')
......
......@@ -3,7 +3,7 @@
pkgname=lapack
pkgver=3.8.0
pkgdesc="Linear Algebra PACKage"
pkgrel=1
pkgrel=2
url="http://www.netlib.org/lapack"
depends=("openblas")
makedepends=('gcc-fortran' 'cmake' 'python2' 'doxygen')
......
......@@ -5,7 +5,7 @@
pkgname=lensfun
pkgver=0.3.2
pkgrel=3
pkgrel=4
pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
arch=('x86_64')
url="http://sourceforge.net/projects/lensfun"
......
From f6d14b3b510de5c50e45c98fe812a73ba00f3def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 9 Jun 2016 10:50:41 +0200
Subject: [PATCH] Allow building with mdds-1.2
Change-Id: If8791b4c1c3fbefdd06af345276e0a724dff5482
---
configure.ac | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index ca4bb07..bb946eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_LANG([C++])
# Configure options
# =================
AC_ARG_WITH([mdds],
- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
+ AS_HELP_STRING([--with-mdds=1.2|1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
[], [with_mdds="1.0"])
# ===========================
@@ -47,7 +47,7 @@ AC_PROG_SED
AM_MISSING_PROG([GPERF], [gperf])
-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
+AS_IF([test "$with_mdds" = "1.0" -o "$with_mdds" = "1.2" ], [AX_CXX_COMPILE_STDCXX_11([noext])])
# ===============
# Find librevenge
@@ -138,25 +138,27 @@ AC_SUBST([GLM_CFLAGS])
# =========
# Find mdds
# =========
-AS_IF([test "$with_mdds" = "1.0"], [
- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
-], [
- PKG_CHECK_MODULES([MDDS], [mdds])
- AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <mdds/flat_segment_tree.hpp>
- struct Value {};
- mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
- ])], [
- AC_MSG_RESULT([yes])
- ], [
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([please install mdds >= 0.12.1])
- ])
- CPPFLAGS="$old_CPPFLAGS"
-])
+AS_CASE(["$with_mdds"],
+ ["1.2"], [PKG_CHECK_MODULES([MDDS], [mdds-1.2])],
+ ["1.0"], [PKG_CHECK_MODULES([MDDS], [mdds-1.0])],
+ [
+ PKG_CHECK_MODULES([MDDS], [mdds])
+ AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <mdds/flat_segment_tree.hpp>
+ struct Value {};
+ mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
+ ])], [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([please install mdds >= 0.12.1])
+ ])
+ CPPFLAGS="$old_CPPFLAGS"
+ ]
+)
# =================================
# Libtool/Version Makefile settings
--
2.9.3
From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 30 Sep 2016 09:57:15 +0200
Subject: [PATCH] drop test that violates Unicode tr#35
(and therefore fails with latest liblangtag)
Change-Id: I0e06c6c4e8bcf999cf5559d6287e77ae97e555d8
---
src/test/IWORKLanguageManagerTest.cpp | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/test/IWORKLanguageManagerTest.cpp b/src/test/IWORKLanguageManagerTest.cpp
index 8fca0a6..e663bd2 100644
--- a/src/test/IWORKLanguageManagerTest.cpp
+++ b/src/test/IWORKLanguageManagerTest.cpp
@@ -104,16 +104,6 @@ void IWORKLanguageManagerTest::testTagToProps()
}
{
- const string tag(mgr.addTag("ccc"));
- CPPUNIT_ASSERT(!tag.empty());
- RVNGPropertyList props;
- mgr.writeProperties(tag, props);
- assertProperty("unknown lang", props, "fo:language", "ccc");
- CPPUNIT_ASSERT(!props["fo:country"]);
- CPPUNIT_ASSERT(!props["fo:script"]);
- }
-
- {
// invalid tag
const string tag(mgr.addTag("13c"));
CPPUNIT_ASSERT(tag.empty());
--
2.9.3
pkgname=libetonyek
pkgver=0.1.6
pkgrel=4
pkgver=0.1.7
pkgrel=1
pkgdesc='Library and a set of tools for reading and converting Apple Keynote presentations'
arch=('x86_64')
url='https://wiki.documentfoundation.org/DLP/Libraries/libetonyek'
license=('MPL')
depends=('libxml2' 'zlib' 'libwpd' 'boost-libs' 'librevenge' 'liblangtag')
makedepends=('boost' 'cppunit' 'gperf' 'doxygen' 'glm' 'mdds')
source=(http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${pkgver}.tar.xz
0001-Allow-building-with-mdds-1.2.patch
0001-drop-test-that-violates-Unicode-tr-35.patch)
md5sums=('dfe25b0c7739283a5c61a930ea1f9bf8'
'0635b9c27717596828ac32d9e0521eb3'
'aa201a5d1058122f523685c3f47bb5ae')
source=(http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${pkgver}.tar.xz)
md5sums=('3088732de0028b1340668b8a3caf3c25')
prepare() {
cd ${pkgname}-${pkgver}
patch -Np1 -i ../0001-Allow-building-with-mdds-1.2.patch
patch -Np1 -i ../0001-drop-test-that-violates-Unicode-tr-35.patch
autoreconf -vfi
}
build() {
cd ${pkgname}-${pkgver}
......
# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/libffado
pkgname=libffado
pkgver=2.2.1
pkgrel=4
pkgver=2.4.0
pkgrel=1
pkgdesc="Driver for FireWire audio devices"
arch=('x86_64')
url="http://www.ffado.org/"
......@@ -12,27 +12,17 @@ depends=('libiec61883' 'libavc1394' 'libsigc++' 'libxml++' 'alsa-lib'
makedepends=('scons' 'python2-pyqt4' 'jack2' 'python2-dbus')
optdepends=('python2-pyqt4: mixer applet'
'python2: ffado-diag')
source=("http://www.ffado.org/files/libffado-$pkgver.tgz"
'fix-test-errno-usage.patch')
md5sums=('e113d828835051f835fb4a329cb0cbd4'
'd9cf3bed720e82ea97e29003f20b3c6b')
source=("http://www.ffado.org/files/libffado-$pkgver.tgz")
md5sums=('3050229da90bbc4830acc0d09a92b8f2')
prepare() {
cd $pkgname-$pkgver
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=805211
patch -Np1 -i ../fix-test-errno-usage.patch
}
build() {
cd $pkgname-$pkgver
scons DEBUG=False \
PREFIX=/usr \
scons PREFIX=/usr \
DEBUG=no \
MANDIR=/usr/share/man \
UDEVDIR=/usr/lib/udev/rules.d \
COMPILE_FLAGS="$CFLAGS -std=gnu++11"
UDEVDIR=/usr/lib/udev/rules.d
}
package() {
......@@ -46,4 +36,7 @@ package() {
install -Dm644 support/xdg/hi64-apps-ffado.png \
"$pkgdir/usr/share/pixmaps/ffado.png"
install -Dm644 AUTHORS "${pkgdir}/usr/share/doc/${pkgname}/AUTHORS"
install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
}
--- a/tests/test-enhanced-mixer.cpp
+++ b/tests/test-enhanced-mixer.cpp
@@ -77,7 +77,7 @@
exit(0);
}
- int errno = 0;
+ extern int errno;
char* tail;
int node_id = strtol( argv[1], &tail, 0 );
int fb_id = strtol( argv[2], &tail, 0 );
--- a/tests/test-mixer.cpp
+++ b/tests/test-mixer.cpp
@@ -227,7 +227,7 @@
exit(0);
}
- int errno = 0;
+ extern int errno;
char* tail;
int port = strtol( argv[1], &tail, 0 );
int node_id = strtol( argv[2], &tail, 0 );
--- a/tests/test-pan.cpp
+++ b/tests/test-pan.cpp
@@ -131,7 +131,7 @@
exit(0);
}
- int errno = 0;
+ extern int errno;
char* tail;
int node_id = strtol( argv[1], &tail, 0 );
int fb_id = strtol( argv[2], &tail, 0 );
--- a/tests/test-volume.cpp
+++ b/tests/test-volume.cpp
@@ -127,7 +127,7 @@
exit(0);
}
- int errno = 0;
+ extern int errno;
char* tail;
int node_id = strtol( argv[1], &tail, 0 );
int fb_id = strtol( argv[2], &tail, 0 );
\ No newline at end of file
This diff is collapsed.
pkgname=libftdi
pkgver=1.2
pkgrel=2
pkgver=1.4
pkgrel=1
pkgdesc="A library to talk to FTDI chips, optional python bindings."
arch=('x86_64')
url="http://www.intra2net.com/en/developer/libftdi/download.php"
......@@ -9,7 +9,7 @@ depends=('libusb')
optdepends=('python3: library bindings')
makedepends=('boost' 'cmake' 'python3' 'swig')
source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2)
sha1sums=('636b9fcc745bf4eeb027a1dd891f770158444f7a')
sha1sums=('5b14cebab8168e12dd6c2b5325a29ad93ed40f3d')
prepare() {
cd "${pkgname}1-$pkgver"
......
pkgname=libmodplug
# Caution: This package has a lib32 alternative, make sure to update that also
pkgver=0.8.8.5
pkgrel=2
pkgrel=3
pkgdesc="A MOD playing library"
arch=('x86_64')
url="http://modplug-xmms.sourceforge.net/"
......
......@@ -2,13 +2,13 @@
pkgname=libmp4v2
pkgver=2.0.0
pkgrel=2
pkgrel=3
pkgdesc="MPEG-4 library"
arch=('x86_64')
license=('MPL')
url="http://code.google.com/p/mp4v2/"
depends=('gcc-libs')
source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
source=("https://sources.archlinux.org/other/packages/$pkgname/mp4v2-${pkgver}.tar.bz2")
md5sums=('c91f06711225b34b4c192c9114887b14')
build() {
......
......@@ -2,7 +2,7 @@
pkgname=libproxy
pkgver=0.4.12
pkgrel=1
pkgrel=2
pkgdesc="A library that provides automatic proxy configuration management"
arch=('x86_64')
license=('LGPL')
......
pkgbase=libsigc++
pkgname=('libsigc++' 'libsigc++-docs')
pkgver=2.10.0
pkgrel=1
pkgrel=2
arch=('x86_64')
license=('LGPL')
url="http://libsigc.sourceforge.net/"
......
......@@ -3,7 +3,7 @@
pkgname=libvdpau
pkgver=1.1.1
pkgrel=1
pkgrel=2
pkgdesc="Nvidia VDPAU library"
arch=('x86_64')
url='http://cgit.freedesktop.org/~aplattner/libvdpau'
......
# Maintainer: almack[at]chakraos[dot]org>
pkgname=libvpx
pkgver=1.5.0
pkgrel=2
pkgver=1.6.1
pkgrel=1
pkgdesc='VP8 and VP9 codec'
arch=('x86_64')
url="http://www.webmproject.org/"
......@@ -11,20 +10,24 @@ depends=('glibc' 'gcc-libs')
makedepends=('yasm' 'git')
provides=('libvpx.so')
source=($pkgname-$pkgver.tar.gz::https://github.com/webmproject/libvpx/archive/v$pkgver.tar.gz)
md5sums=('0c662bc7525afe281badb3175140d35c')
md5sums=('b0925c8266e2859311860db5d76d1671')
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr \
--enable-vp8 \
--enable-vp9 \
./configure \
--prefix='/usr' \
--enable-runtime-cpu-detect \
--enable-shared \
--enable-postproc \
--enable-pic \
--enable-experimental --enable-spatial-svc \
--disable-install-docs \
--disable-install-srcs
--disable-install-srcs \
--enable-vp8 \
--enable-postproc \
--enable-vp9 \
--enable-vp9-highbitdepth \
--enable-experimental \
--enable-spatial-svc
make
}
......
......@@ -2,7 +2,7 @@
pkgname=mjpegtools
pkgver=2.1.0
pkgrel=2
pkgrel=3
pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
arch=('x86_64')
license=('GPL')
......@@ -10,19 +10,32 @@ url="http://mjpeg.sourceforge.net/"
depends=('libjpeg-turbo' 'libpng' 'sdl' 'gcc-libs' 'libdv')
makedepends=('v4l-utils')
options=('!makeflags')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz")
md5sums=('57bf5dd78976ca9bac972a6511b236f3')
source=("http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz"
mjpegtools-2.1.0-no_format.patch
mjpegtools-2.1.0-pic.patch
mjpegtools-2.1.0-sdl-cflags.patch)
md5sums=('57bf5dd78976ca9bac972a6511b236f3'
'1ada83185885e2b9f952214fc010fece'
'00e2790ca6a0331d23cd1a504e02b782'
'6f9604d0afa88e6fbae20975971cb1d7')
prepare() {
cd ${pkgname}-${pkgver}
patch -p1 -i ../mjpegtools-2.1.0-no_format.patch
patch -p1 -i ../mjpegtools-2.1.0-pic.patch
patch -p1 -i ../mjpegtools-2.1.0-sdl-cflags.patch
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
}
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr --enable-largefile
make
make # CFLAGS="${CFLAGS} -fPIC"
}
package() {
......
--- ./lavtools/lav_io.c.orig 2014-07-27 17:48:21.474622974 +0100
+++ ./lavtools/lav_io.c 2014-07-27 17:48:48.838881166 +0100
@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi
strcat(errmsg, ", quicktime");
#endif
strcat(errmsg, ").\n");
- fprintf(stderr, errmsg);
+ fprintf(stderr, "%s", errmsg);
free(lav_fd);
internal_error = ERROR_FORMAT; /* Format not recognized */
return 0;
--- ./lavtools/lavtrans.c.orig 2014-07-27 17:58:09.410282056 +0100
+++ ./lavtools/lavtrans.c 2014-07-27 17:59:24.769016140 +0100
@@ -275,7 +275,7 @@ int main(int argc, char ** argv)
if (process_image_frame != -1)
{
nv = el_get_video_frame(vbuff, process_image_frame, &el);
- sprintf(imgfname,outfile);
+ sprintf(imgfname, "%s", outfile);
imgfd = fopen(imgfname,"wb");
if (imgfd==0) system_error("opening image file","fopen");
res = fwrite(vbuff,nv,1,imgfd);
--- ./lavtools/jpeg2yuv.c.orig 2014-07-27 18:00:55.600900476 +0100
+++ ./lavtools/jpeg2yuv.c 2014-07-27 18:01:36.848301893 +0100
@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
if (firstjpeg) {
p = firstjpeg;
- sprintf(jpegname, firstjpeg);
+ sprintf(jpegname, "%s", firstjpeg);
firstjpeg = NULL;
}
else {
--- ./mplex/main.cpp.orig 2014-07-27 18:11:38.282143657 +0100
+++ ./mplex/main.cpp 2014-07-27 18:06:40.352252415 +0100
@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
if( flag_table[flag].longname != 0 )
message += sep;
}
- mjpeg_error( message.c_str() );
+ mjpeg_error( "%s", message.c_str() );
return false;
}
--- ./yuvfilters/yuvkineco.c.orig 2014-07-27 18:15:01.476097522 +0100
+++ ./yuvfilters/yuvkineco.c 2014-07-27 18:15:29.540366245 +0100
@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
} else {
#ifdef MJPEGTOOLS
buf[n] = '\0';
- mjpeg_debug(buf);
+ mjpeg_debug("%s", buf);
#else
fputs(buf, stderr);
#endif
--- ./yuvfilters/yuvfilters.h.orig 2014-07-27 18:37:02.712645244 +0100
+++ ./yuvfilters/yuvfilters.h 2014-07-27 19:13:28.156101800 +0100
@@ -34,9 +34,9 @@ extern "C" {
#ifdef MJPEGTOOLS
# define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno))
-# define WERROR(MSG) mjpeg_error(MSG)
-# define WERRORL(MSG) mjpeg_error(MSG)
-# define WWARN(MSG) mjpeg_warn(MSG)
+# define WERROR(MSG) mjpeg_error("%s", MSG)
+# define WERRORL(MSG) mjpeg_error("%s", MSG)
+# define WWARN(MSG) mjpeg_warn("%s", MSG)
#else
# define WERROR(MSG) write(2, MSG "\n", sizeof MSG)
# define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0)
diff -Naur mjpegtools-2.1.0/y4mdenoise/Makefile.am mjpegtools-2.1.0_patch/y4mdenoise/Makefile.am
--- mjpegtools-2.1.0/y4mdenoise/Makefile.am 2012-04-01 10:43:55.000000000 +0200
+++ mjpegtools-2.1.0_patch/y4mdenoise/Makefile.am 2018-01-20 00:30:11.027358835 +0100
@@ -4,8 +4,8 @@
EXTRA_DIST = implementation.html
-AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
-AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+AM_CFLAGS = -DNDEBUG -finline-functions
+AM_CXXFLAGS = -DNDEBUG -finline-functions
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
diff -Naur mjpegtools-2.1.0/y4munsharp/Makefile.am mjpegtools-2.1.0_patch/y4munsharp/Makefile.am
--- mjpegtools-2.1.0/y4munsharp/Makefile.am 2005-06-16 19:09:38.000000000 +0200
+++ mjpegtools-2.1.0_patch/y4munsharp/Makefile.am 2018-01-20 00:30:37.571074577 +0100
@@ -4,7 +4,7 @@
INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
-y4munharp_CFLAGS=@PROGRAM_NOPIC@
+y4munharp_CFLAGS=
bin_PROGRAMS = y4munsharp