Changeset 1370


Ignore:
Timestamp:
Mar 14, 2016, 2:41:37 PM (9 years ago)
Author:
Silvan Scherrer
Message:

cups-filters: adjustments to have it built

Location:
cups-filter/trunk
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified cups-filter/trunk/Makefile.am

    r1295 r1370  
    2626# ========
    2727pkgbackenddir = $(CUPS_SERVERBIN)/backend
    28 pkgbackend_PROGRAMS = parallel serial beh implicitclass
     28pkgbackend_PROGRAMS = parallel beh implicitclass
    2929
    3030check_PROGRAMS = test1284
    … …  
    413413        filter/pdftoopvp/pdftoopvp.cxx
    414414pdftoopvp_CFLAGS = \
     415        $(POPPLER_CFLAGS) \
    415416        $(CUPS_CFLAGS) \
    416417        $(FREETYPE_CFLAGS) \
    417418        $(FONTCONFIG_CFLAGS) \
    418419        $(LIBPNG_CFLAGS) \
    419         $(POPPLER_CFLAGS) \
    420420        -I$(srcdir)/filter/pdftoopvp/oprs \
    421421        -I$(srcdir)/filter/pdftoopvp/opvp
    … …  
    532532EXTRA_bannertopdf_SOURCES = filter/getline.c
    533533bannertopdf_CFLAGS = \
     534        $(POPPLER_CFLAGS) \
    534535        $(CUPS_CFLAGS) \
    535536        $(LIBJPEG_CFLAGS) \
    536537        $(LIBPNG_CFLAGS) \
    537         $(POPPLER_CFLAGS) \
    538538        $(TIFF_CFLAGS) \
    539539        $(FONTCONFIG_CFLAGS) \
    … …  
    667667        filter/PDFError.h
    668668pdftoijs_CFLAGS = \
    669         $(CUPS_CFLAGS) \
    670         $(IJS_CFLAGS) \
    671         $(POPPLER_CFLAGS)
     669        $(POPPLER_CFLAGS) \
     670        $(CUPS_CFLAGS) \
     671        $(IJS_CFLAGS)
    672672pdftoijs_CXXFLAGS = $(pdftoijs_CFLAGS)
    673673pdftoijs_LDADD = \
    … …  
    698698        filter/PDFError.h
    699699pdftoraster_CFLAGS = \
     700        $(POPPLER_CFLAGS) \
    700701        $(CUPS_CFLAGS) \
    701702        $(LCMS_CFLAGS) \
    702703        $(LIBJPEG_CFLAGS) \
    703704        $(LIBPNG_CFLAGS) \
    704         $(POPPLER_CFLAGS) \
    705705        $(TIFF_CFLAGS) \
    706706        -I$(srcdir)/cupsfilters/
    … …  
    803803            utils/org.cups.cupsd.Notifier.xml
    804804
     805if BUILD_DBUS
    805806sbin_PROGRAMS = \
    806807        cups-browsed
     808endif
    807809cups_browsed_SOURCES = \
    808810        utils/cups-browsed.c
    … …  
    836838        $(man_MANS) \
    837839        utils/org.cups.cupsd.Notifier.xml
     840if BUILD_DBUS
    838841BUILT_SOURCES = $(cups_notifier_sources)
     842endif
    839843CLEANFILES = $(BUILT_SOURCES)
    840844

  • TabularUnified cups-filter/trunk/configure.ac

    r1295 r1370  
    333333fi
    334334
    335 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2])
     335PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.25.15])
    336336AC_SUBST(GLIB_CFLAGS)
    337337AC_SUBST(GLIB_LIBS)

  • TabularUnified cups-filter/trunk/filter/bannertopdf.c

    r1295 r1370  
    514514
    515515    pdf_write(doc, stdout);
     516#ifdef __OS2__
     517    fflush(stdout);
     518#endif
    516519    free(buf);
    517520    pdf_free(doc);

  • cups-filter/trunk/filter/foomatic-rip

    • Property svn:ignore set to
      foomatic-rip.1

  • TabularUnified cups-filter/trunk/filter/foomatic-rip/process.c

    r1295 r1370  
    3131#include <signal.h>
    3232
     33#ifdef __OS2__
     34#include <sys/socket.h>
     35#define pipe(A) socketpair(AF_UNIX, SOCK_STREAM,0, A)
     36#endif
     37
    3338int kidgeneration = 0;
    3439

  • TabularUnified cups-filter/trunk/filter/gstopxl

    r1295 r1370  
    4646
    4747resolution=
    48 eval "$(printf "%s" "$5" | sed -nEe 's/.*(^|[[:space:]])(printer-resolution|Resolution)=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\3}"/pi')"
    49 if test -e "$PPD"; then
    50   eval "$(sed -nEe 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")"
     48eval "$(printf "%s" "$5" | sed -nre 's/.*(^|[[:space:]])(printer-resolution|Resolution)=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\3}"/pi')"
     49if test -e "$PPD"; then
     50  eval "$(sed -nre 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")"
    5151fi
    5252echo "DEBUG: Resolution: $resolution" >&2
    … …  
    5656
    5757pagesize=
    58 eval "$(printf "%s" "$5" | sed -nEe 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/pi')"
    59 if test -e "$PPD"; then
    60   eval "$(sed -nEe 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")"
     58eval "$(printf "%s" "$5" | sed -nre 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/pi')"
     59if test -e "$PPD"; then
     60  eval "$(sed -nre 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")"
    6161fi
    6262echo "DEBUG: Page size: $pagesize" >&2
    … …  
    6464height=
    6565if test -n "$pagesize" && test -e "$PPD"; then
    66   eval "$(sed -nEe 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")"
     66  eval "$(sed -nre 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")"
    6767fi
    6868echo "DEBUG: Width: $width, height: $height" >&2
    … …  
    7979tr_y=
    8080if test -n "$pagesize" && test -e "$PPD"; then
    81   eval "$(sed -nEe 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")"
     81  eval "$(sed -nre 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")"
    8282fi
    8383echo "DEBUG: Absolute margins: $bl_x, $bl_y, $tr_x, $tr_y" >&2
    … …  
    101101
    102102inputslot=
    103 eval "$(printf "%s" "$5" | sed -nEe 's/.*(^|[[:space:]])(media-position|MediaPosition|media-source|MediaSource|InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/pi')"
    104 if test -e "$PPD"; then
    105   eval "$(sed -nEe 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")"
     103eval "$(printf "%s" "$5" | sed -nre 's/.*(^|[[:space:]])(media-position|MediaPosition|media-source|MediaSource|InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/pi')"
     104if test -e "$PPD"; then
     105  eval "$(sed -nre 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")"
    106106fi
    107107echo "DEBUG: InputSlot: $inputslot" >&2
    108108inputslot_val=
    109109if test -n "$inputslot" && test -e "$PPD"; then
    110   eval "$(sed -nEe 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")"
     110  eval "$(sed -nre 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")"
    111111else
    112112  if echo "$inputslot" | grep -qiE 'Default'; then
    … …  
    132132
    133133colormodel=
    134 eval "$(printf "%s" "$5" | sed -nEe 's/.*(^|[[:space:]])(pwg-raster-document-type|PwgRasterDocumentType|print-color-mode|PrintColorMode|color-space|ColorSpace|color-model|ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/pi')"
    135 if test -e "$PPD"; then
    136   eval "$(sed -nEe 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")"
     134eval "$(printf "%s" "$5" | sed -nre 's/.*(^|[[:space:]])(pwg-raster-document-type|PwgRasterDocumentType|print-color-mode|PrintColorMode|color-space|ColorSpace|color-model|ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/pi')"
     135if test -e "$PPD"; then
     136  eval "$(sed -nre 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")"
    137137fi
    138138echo "DEBUG: ColorModel: $colormodel" >&2
    … …  
    142142colormodel_val=
    143143if test -n "$colormodel" && test -e "$PPD"; then
    144   eval "$(sed -nEe 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")"
     144  eval "$(sed -nre 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")"
    145145fi
    146146echo "DEBUG: Value for BitsPerPixel: $colormodel_val" >&2
    … …  
    151151duplex=
    152152tumble=
    153 eval "$(printf "%s" "$5" | sed -nEe 's/.*(^|[[:space:]])(Duplex|sides)=([^[:space:]]+).*/duplex="${duplex:-\3}"/pi')"
    154 eval "$(printf "%s" "$5" | sed -nEe 's/.*(^|[[:space:]])(Tumble)=([^[:space:]]+).*/tumble="${tumble:-\3}"/pi')"
    155 if test -e "$PPD"; then
    156   eval "$(sed -nEe 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")"
     153eval "$(printf "%s" "$5" | sed -nre 's/.*(^|[[:space:]])(Duplex|sides)=([^[:space:]]+).*/duplex="${duplex:-\3}"/pi')"
     154eval "$(printf "%s" "$5" | sed -nre 's/.*(^|[[:space:]])(Tumble)=([^[:space:]]+).*/tumble="${tumble:-\3}"/pi')"
     155if test -e "$PPD"; then
     156  eval "$(sed -nre 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")"
    157157fi
    158158echo "DEBUG: Duplex: $duplex" >&2
    … …  
    161161tumble_val=
    162162if test -n "$duplex" && test -e "$PPD"; then
    163   eval "$(sed -nEe 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")"
     163  eval "$(sed -nre 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")"
    164164else
    165165  if echo "$duplex" | grep -qiE 'None|Off|False|No|One'; then
    … …  
    209209cat >"$ifile"
    210210
    211 echo INFO: Starting GPL Ghostscript `/usr/bin/gs --version`... 1>&2
    212 echo DEBUG: Running /usr/bin/gs $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile" 1>&2
     211echo INFO: Starting GPL Ghostscript `/@unixroot/usr/bin/gs.exe --version`... 1>&2
     212echo DEBUG: Running /@unixroot/usr/bin/gs.exe $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile" 1>&2
    213213
    214214# Now run Ghostscript...
    215 /usr/bin/gs $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile"
    216 
    217 #
    218 #
     215/@unixroot/usr/bin/gs.exe $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile"
     216
     217#
     218#

  • TabularUnified cups-filter/trunk/filter/gstoraster.c

    r1295 r1370  
    5656#ifndef CUPSDATA
    5757#define CUPSDATA "/usr/share/cups"
     58#endif
     59
     60#ifdef __OS2__
     61#define pipe(A) socketpair(AF_UNIX, SOCK_STREAM,0, A)
    5862#endif
    5963

  • TabularUnified cups-filter/trunk/filter/imagetopdf.c

    r1295 r1370  
    16661666#endif
    16671667
     1668#ifdef __OS2__
     1669  fflush(stdout);
     1670#endif
    16681671  cupsImageClose(img);
    16691672  ppdClose(ppd);

  • TabularUnified cups-filter/trunk/filter/imagetoraster.c

    r1295 r1370  
    126126static int      raster_cb(cups_page_header2_t *header, int preferred_bits);
    127127
     128#ifdef __OS2__
     129#define pipe(A) socketpair(AF_UNIX, SOCK_STREAM,0, A)
     130#endif
    128131
    129132/*

  • TabularUnified cups-filter/trunk/filter/pdftops.c

    r1295 r1370  
    3737
    3838#define MAX_CHECK_COMMENT_LINES 20
     39
     40#ifdef __OS2__
     41#define pipe(A) socketpair(AF_UNIX, SOCK_STREAM,0, A)
     42#endif
    3943
    4044/*
    … …  
    10001004        while ((bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
    10011005          fwrite(buffer, 1, bytes, stdout);
     1006#ifdef __OS2__
     1007        fflush(stdout);
     1008#endif
    10021009      }
    10031010      else
    … …  
    12711278          while ((bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
    12721279            fwrite(buffer, 1, bytes, stdout);
     1280#ifdef __OS2__
     1281          fflush(stdout);
     1282#endif
    12731283        }
    12741284      }

  • TabularUnified cups-filter/trunk/filter/rastertoescpx.c

    r1295 r1370  
    3434#include <ctype.h>
    3535
     36#ifdef __OS2__
     37#include <sys/fcntl.h>
     38#endif
    3639
    3740/*

  • TabularUnified cups-filter/trunk/filter/rastertopclx.c

    r1295 r1370  
    3232#include <signal.h>
    3333
     34#ifdef __OS2__
     35#include <sys/fcntl.h>
     36#endif
    3437
    3538/*

  • TabularUnified cups-filter/trunk/filter/sys5ippprinter.c

    r1295 r1370  
    4242
    4343#define MAX_CHECK_COMMENT_LINES 20
     44
     45#ifdef __OS2__
     46#define pipe(A) socketpair(AF_UNIX, SOCK_STREAM,0, A)
     47#endif
    4448
    4549/*
Note: See TracChangeset for help on using the changeset viewer.