TDE
/
libksquirrel
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libksquirrel
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS on freebsd

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/2/head
Slávek Banko 9 years ago
parent aef0dd23e5
commit 7d97c1a5ed
16 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
configure.ac
Unescape View File

@ -422,7 +422,7 @@ PKG_CHECK_MODULES([OpenEXR], OpenEXR, [
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
CPPFLAGS="$SQ_EXR_CFLAGS $CPPFLAGS"
CPPFLAGS="$SQ_EXR_CFLAGS $CPPFLAGS $USE_EXCEPTIONS"
LDFLAGS="$LDFLAGS $SQ_EXR_LDFLAGS"
AC_LANG_SAVE

2
kernel/kls_camera/Makefile.am
Unescape View File

@ -36,4 +36,4 @@ EXTRA_DIST = libkls_camera.so.ui ksquirrel-libs-camera2ppm.in
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 libkls_camera.so.ui $(DESTDIR)$(pkgdatadir)/libkls_camera.so.ui
$(INSTALL) -m 0644 libkls_camera.so.ui $(DESTDIR)$(pkgdatadir)/libkls_camera.so.ui

2
kernel/kls_djvu/Makefile.am
Unescape View File

@ -14,4 +14,4 @@ EXTRA_DIST = libkls_djvu.so.ui
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 libkls_djvu.so.ui $(DESTDIR)$(pkgdatadir)/libkls_djvu.so.ui
$(INSTALL) -m 0644 libkls_djvu.so.ui $(DESTDIR)$(pkgdatadir)/libkls_djvu.so.ui

2
kernel/kls_dxf/Makefile.am
Unescape View File

@ -14,4 +14,4 @@ EXTRA_DIST = libkls_dxf.so.ui
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 libkls_dxf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_dxf.so.ui
$(INSTALL) -m 0644 libkls_dxf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_dxf.so.ui

4
kernel/kls_gif/fmt_codec_gif.cpp
Unescape View File

@ -50,9 +50,9 @@ static void PrintGifError(void)
#endif
{
#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 4
char *Err = GifErrorString(ErrorCode);
const char *Err = GifErrorString(ErrorCode);
#else
char *Err = GifErrorString();
const char *Err = GifErrorString();
#endif
if (Err != NULL) {

3
kernel/kls_jpeg/fmt_codec_jpeg.cpp
Unescape View File

@ -277,7 +277,7 @@ s32 fmt_codec::write_next_pass()
s32 fmt_codec::write_scanline(RGBA *scan)
{
RGB sr[writeimage.w];
RGB *sr = new RGB[writeimage.w];
for(s32 s = 0;s < writeimage.w;s++)
{
@ -288,6 +288,7 @@ s32 fmt_codec::write_scanline(RGBA *scan)
(void)jpeg_write_scanlines(&m_cinfo, &row_pointer, 1);
delete [] sr;
return SQE_OK;
}

3
kernel/kls_ljpeg/ljpeg2ppm/huffd.c
Unescape View File

@ -36,7 +36,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
#include <malloc.h>
#endif
#include "jpeg.h"
#include "mcu.h"
#include "io.h"

3
kernel/kls_ljpeg/ljpeg2ppm/ljpgtopnm.c
Unescape View File

@ -35,7 +35,10 @@
#include <stdio.h>
#include <stdlib.h>
#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
#include <malloc.h>
#endif
#include <string.h>
#include "jpeg.h"
#include "mcu.h"

3
kernel/kls_ljpeg/ljpeg2ppm/mcu.c
Unescape View File

@ -30,7 +30,10 @@
#include <stdio.h>
#include <stdlib.h>
#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
#include <malloc.h>
#endif
#include <string.h>
#include "jpeg.h"
#include "mcu.h"

3
kernel/kls_ljpeg/ljpeg2ppm/read.c
Unescape View File

@ -35,7 +35,10 @@
#include <stdio.h>
#include <stdlib.h>
#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
#include <malloc.h>
#endif
#include <string.h>
#include "jpeg.h"
#include "mcu.h"

3
kernel/kls_ljpeg/ljpeg2ppm/util.c
Unescape View File

@ -36,7 +36,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
#include <malloc.h>
#endif
#include "jpeg.h"
#include "mcu.h"
#include "proto.h"

2
kernel/kls_svg/Makefile.am
Unescape View File

@ -16,4 +16,4 @@ EXTRA_DIST = libkls_svg.so.ui ksquirrel-libs-svg2png.in
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 libkls_svg.so.ui $(DESTDIR)$(pkgdatadir)/libkls_svg.so.ui
$(INSTALL) -m 0644 libkls_svg.so.ui $(DESTDIR)$(pkgdatadir)/libkls_svg.so.ui

2
kernel/kls_tiff/Makefile.am
Unescape View File

@ -12,6 +12,6 @@ EXTRA_DIST = libkls_tiff.so.ui
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 libkls_tiff.so.ui $(DESTDIR)$(pkgdatadir)/libkls_tiff.so.ui
$(INSTALL) -m 0644 libkls_tiff.so.ui $(DESTDIR)$(pkgdatadir)/libkls_tiff.so.ui
AM_CXXFLAGS = -DTIFF_UI=\"${pkgdatadir}/libkls_tiff.so.ui\"

2
kernel/kls_xcf/Makefile.am
Unescape View File

@ -15,4 +15,4 @@ EXTRA_DIST = libkls_xcf.so.ui
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 libkls_xcf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_xcf.so.ui
$(INSTALL) -m 0644 libkls_xcf.so.ui $(DESTDIR)$(pkgdatadir)/libkls_xcf.so.ui

3
kernel/kls_xcf/xcf2pnm/Makefile.am
Unescape View File

@ -1,5 +1,6 @@
bin_PROGRAMS = ksquirrel-libs-xcf2pnm
ksquirrel_libs_xcf2pnm_SOURCES = enums.c flatspec.c flatten.c io-unix.c pixels.c scaletab.c table.c utils.c xcf2pnm.c xcf-general.c
ksquirrel_libs_xcf2pnm_LDFLAGS = $(LIBICONV)
EXTRA_DIST = xcf2pnm.oi
EXTRA_DIST = xcf2pnm.oi

2
kernel/kls_xpm/Makefile.am
Unescape View File

@ -14,4 +14,4 @@ EXTRA_DIST = rgbmap
install-data-am:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) --mode=0644 rgbmap $(DESTDIR)$(pkgdatadir)/rgbmap
$(INSTALL) -m 0644 rgbmap $(DESTDIR)$(pkgdatadir)/rgbmap

Write Preview
Loading…
Cancel
Save