CVS commit: pkgsrc/x11

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 23 14:31:12 UTC 2020

Modified Files:
        pkgsrc/x11: Makefile
        pkgsrc/x11/xvidcap: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/xvidcap/patches: patch-configure patch-src_capture.c
Removed Files:
        pkgsrc/x11/xvidcap: Makefile.common
        pkgsrc/x11/xvidcap-gtk2: DESCR Makefile PLIST
        pkgsrc/x11/xvidcap/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-src_xtomng.c patch-src_xtopng.c

Log Message:
xvidcap: Update to 1.1.7

Unknown changes. This is a very old release and the NEWS file is empty.


To generate a diff of this commit:
cvs rdiff -u -r1.885 -r1.886 pkgsrc/x11/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xvidcap/Makefile
cvs rdiff -u -r1.12 -r0 pkgsrc/x11/xvidcap/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xvidcap/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xvidcap/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xvidcap-gtk2/DESCR
cvs rdiff -u -r1.50 -r0 pkgsrc/x11/xvidcap-gtk2/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xvidcap-gtk2/PLIST
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xvidcap/patches/patch-aa \
    pkgsrc/x11/xvidcap/patches/patch-ac pkgsrc/x11/xvidcap/patches/patch-ad
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xvidcap/patches/patch-ab \
    pkgsrc/x11/xvidcap/patches/patch-af
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xvidcap/patches/patch-ae
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xvidcap/patches/patch-ag \
    pkgsrc/x11/xvidcap/patches/patch-src_xtomng.c \
    pkgsrc/x11/xvidcap/patches/patch-src_xtopng.c
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xvidcap/patches/patch-configure \
    pkgsrc/x11/xvidcap/patches/patch-src_capture.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.885 pkgsrc/x11/Makefile:1.886
--- pkgsrc/x11/Makefile:1.885   Tue Mar 31 23:08:28 2020
+++ pkgsrc/x11/Makefile Thu Apr 23 14:31:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.885 2020/03/31 23:08:28 gutteridge Exp $
+# $NetBSD: Makefile,v 1.886 2020/04/23 14:31:11 nia Exp $
 #
 
 COMMENT=       Packages to support the X window system
@@ -670,7 +670,6 @@ SUBDIR+=    xtrans
 SUBDIR+=       xtruss
 SUBDIR+=       xvattr
 SUBDIR+=       xvidcap
-SUBDIR+=       xvidcap-gtk2
 SUBDIR+=       xvidtune
 SUBDIR+=       xview
 SUBDIR+=       xview-clients

Index: pkgsrc/x11/xvidcap/Makefile
diff -u pkgsrc/x11/xvidcap/Makefile:1.31 pkgsrc/x11/xvidcap/Makefile:1.32
--- pkgsrc/x11/xvidcap/Makefile:1.31    Mon Feb 26 08:19:32 2018
+++ pkgsrc/x11/xvidcap/Makefile Thu Apr 23 14:31:12 2020
@@ -1,13 +1,58 @@
-# $NetBSD: Makefile,v 1.31 2018/02/26 08:19:32 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/04/23 14:31:12 nia Exp $
 
-.include "Makefile.common"
+DISTNAME=      xvidcap-1.1.7
+CATEGORIES=    x11
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xvidcap/}
 
-PKGREVISION=           22
-COMMENT=               Capture X display to individual frames or MPEG video
+MAINTAINER=    reed%reedmedia.net@localhost
+HOMEPAGE=      http://xvidcap.sourceforge.net/
+COMMENT=       Capture X display to individual frames or MPEG video
+LICENSE=       gnu-gpl-v3
 
-CONFIGURE_ARGS+=       --without-gtk2
-LDFLAGS.DragonFly=     -lXt -lX11
+GNU_CONFIGURE= yes
 
-.include "../../x11/libXext/buildlink3.mk"
+USE_TOOLS+=    gmake perl pkg-config
+USE_TOOLS+=    intltool msgfmt msgmerge xgettext
 
+REPLACE_SH+=   ppm2mpeg.sh
+
+# Don't require gnome-doc-utils
+CONFIGURE_ENV+=        ac_cv_path_SK_CONFIG=no
+CONFIGURE_ENV+=        ac_cv_path_XML2PO=no
+
+# Breaks recording in current X servers
+# https://sourceforge.net/p/xvidcap/bugs/77/
+CONFIGURE_ENV+=        ac_cv_func_shmat=no
+
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} != "none"
+LDFLAGS+=              -lossaudio
+SUBST_CLASSES+=                oss
+SUBST_STAGE.oss=       pre-configure
+SUBST_MESSAGE.oss=     Correcting the path to the OSS device.
+SUBST_FILES.oss+=      src/app_data.c
+SUBST_SED.oss+=                -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+SUBST_CLASSES+=                sr
+SUBST_STAGE.sr=                pre-configure
+SUBST_MESSAGE.sr=      Setting a nicer default audio sample rate.
+SUBST_FILES.sr+=       src/app_data.c
+SUBST_SED.sr+=         -e "s|sndrate = 44100|sndrate = 48000|g"
+.  endif
+.endif
+
+CONFIGURE_ARGS+=       --with-forced-embedded-ffmpeg
+
+.include "options.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xvidcap/PLIST
diff -u pkgsrc/x11/xvidcap/PLIST:1.4 pkgsrc/x11/xvidcap/PLIST:1.5
--- pkgsrc/x11/xvidcap/PLIST:1.4        Sun Jun 14 18:25:19 2009
+++ pkgsrc/x11/xvidcap/PLIST    Thu Apr 23 14:31:12 2020
@@ -1,10 +1,155 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:25:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/04/23 14:31:12 nia Exp $
 bin/xvidcap
+man/de/man1/xvidcap-dbus-client.1
+man/de/man1/xvidcap.1
+man/es/man1/xvidcap.1
+man/it/man1/xvidcap.1
+man/man1/xvidcap-dbus-client.1
 man/man1/xvidcap.1
-share/doc/xvidcap_${PKGVERSION}/AUTHORS
-share/doc/xvidcap_${PKGVERSION}/ChangeLog
-share/doc/xvidcap_${PKGVERSION}/INSTALL
-share/doc/xvidcap_${PKGVERSION}/NEWS
-share/doc/xvidcap_${PKGVERSION}/README
-share/doc/xvidcap_${PKGVERSION}/TODO
-share/doc/xvidcap_${PKGVERSION}/XVidcap.ad
+share/applications/xvidcap.desktop
+share/dbus-1/services/net.jarre_de_the.Xvidcap.service
+share/doc/xvidcap/AUTHORS
+share/doc/xvidcap/COPYING
+share/doc/xvidcap/ChangeLog
+share/doc/xvidcap/README
+share/gnome/help/xvidcap/C/figures/back-button.png
+share/gnome/help/xvidcap/C/figures/edit-button.png
+share/gnome/help/xvidcap/C/figures/filename-button.png
+share/gnome/help/xvidcap/C/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/C/figures/fwd-button.png
+share/gnome/help/xvidcap/C/figures/lock-toggle.png
+share/gnome/help/xvidcap/C/figures/menu-about.png
+share/gnome/help/xvidcap/C/figures/menu-animate.png
+share/gnome/help/xvidcap/C/figures/menu-cont.png
+share/gnome/help/xvidcap/C/figures/menu-help.png
+share/gnome/help/xvidcap/C/figures/menu-make-video.png
+share/gnome/help/xvidcap/C/figures/menu-mf.png
+share/gnome/help/xvidcap/C/figures/menu-prefs.png
+share/gnome/help/xvidcap/C/figures/menu-quit.png
+share/gnome/help/xvidcap/C/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/C/figures/menu-sf.png
+share/gnome/help/xvidcap/C/figures/menu-show-frame.png
+share/gnome/help/xvidcap/C/figures/menu.png
+share/gnome/help/xvidcap/C/figures/pause-toggle.png
+share/gnome/help/xvidcap/C/figures/prefs-commands.png
+share/gnome/help/xvidcap/C/figures/prefs-general.png
+share/gnome/help/xvidcap/C/figures/prefs-mf.png
+share/gnome/help/xvidcap/C/figures/prefs-sf.png
+share/gnome/help/xvidcap/C/figures/record-toggle.png
+share/gnome/help/xvidcap/C/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/C/figures/results-dialog.png
+share/gnome/help/xvidcap/C/figures/selector-button.png
+share/gnome/help/xvidcap/C/figures/step-button.png
+share/gnome/help/xvidcap/C/figures/stop-toggle.png
+share/gnome/help/xvidcap/C/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/C/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/C/xvidcap.xml
+share/gnome/help/xvidcap/de/figures/back-button.png
+share/gnome/help/xvidcap/de/figures/edit-button.png
+share/gnome/help/xvidcap/de/figures/filename-button.png
+share/gnome/help/xvidcap/de/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/de/figures/fwd-button.png
+share/gnome/help/xvidcap/de/figures/lock-toggle.png
+share/gnome/help/xvidcap/de/figures/menu-about.png
+share/gnome/help/xvidcap/de/figures/menu-animate.png
+share/gnome/help/xvidcap/de/figures/menu-cont.png
+share/gnome/help/xvidcap/de/figures/menu-help.png
+share/gnome/help/xvidcap/de/figures/menu-make-video.png
+share/gnome/help/xvidcap/de/figures/menu-mf.png
+share/gnome/help/xvidcap/de/figures/menu-prefs.png
+share/gnome/help/xvidcap/de/figures/menu-quit.png
+share/gnome/help/xvidcap/de/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/de/figures/menu-sf.png
+share/gnome/help/xvidcap/de/figures/menu-show-frame.png
+share/gnome/help/xvidcap/de/figures/menu.png
+share/gnome/help/xvidcap/de/figures/pause-toggle.png
+share/gnome/help/xvidcap/de/figures/prefs-commands.png
+share/gnome/help/xvidcap/de/figures/prefs-general.png
+share/gnome/help/xvidcap/de/figures/prefs-mf.png
+share/gnome/help/xvidcap/de/figures/prefs-sf.png
+share/gnome/help/xvidcap/de/figures/record-toggle.png
+share/gnome/help/xvidcap/de/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/de/figures/results-dialog.png
+share/gnome/help/xvidcap/de/figures/selector-button.png
+share/gnome/help/xvidcap/de/figures/step-button.png
+share/gnome/help/xvidcap/de/figures/stop-toggle.png
+share/gnome/help/xvidcap/de/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/de/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/de/xvidcap.xml
+share/gnome/help/xvidcap/es/figures/back-button.png
+share/gnome/help/xvidcap/es/figures/edit-button.png
+share/gnome/help/xvidcap/es/figures/filename-button.png
+share/gnome/help/xvidcap/es/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/es/figures/fwd-button.png
+share/gnome/help/xvidcap/es/figures/lock-toggle.png
+share/gnome/help/xvidcap/es/figures/menu-about.png
+share/gnome/help/xvidcap/es/figures/menu-animate.png
+share/gnome/help/xvidcap/es/figures/menu-cont.png
+share/gnome/help/xvidcap/es/figures/menu-help.png
+share/gnome/help/xvidcap/es/figures/menu-make-video.png
+share/gnome/help/xvidcap/es/figures/menu-mf.png
+share/gnome/help/xvidcap/es/figures/menu-prefs.png
+share/gnome/help/xvidcap/es/figures/menu-quit.png
+share/gnome/help/xvidcap/es/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/es/figures/menu-sf.png
+share/gnome/help/xvidcap/es/figures/menu.png
+share/gnome/help/xvidcap/es/figures/pause-toggle.png
+share/gnome/help/xvidcap/es/figures/prefs-commands.png
+share/gnome/help/xvidcap/es/figures/prefs-general.png
+share/gnome/help/xvidcap/es/figures/prefs-mf.png
+share/gnome/help/xvidcap/es/figures/prefs-sf.png
+share/gnome/help/xvidcap/es/figures/record-toggle.png
+share/gnome/help/xvidcap/es/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/es/figures/results-dialog.png
+share/gnome/help/xvidcap/es/figures/selector-button.png
+share/gnome/help/xvidcap/es/figures/step-button.png
+share/gnome/help/xvidcap/es/figures/stop-toggle.png
+share/gnome/help/xvidcap/es/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/es/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/es/xvidcap.xml
+share/gnome/help/xvidcap/it/figures/back-button.png
+share/gnome/help/xvidcap/it/figures/edit-button.png
+share/gnome/help/xvidcap/it/figures/filename-button.png
+share/gnome/help/xvidcap/it/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/it/figures/fwd-button.png
+share/gnome/help/xvidcap/it/figures/lock-toggle.png
+share/gnome/help/xvidcap/it/figures/menu-about.png
+share/gnome/help/xvidcap/it/figures/menu-animate.png
+share/gnome/help/xvidcap/it/figures/menu-cont.png
+share/gnome/help/xvidcap/it/figures/menu-help.png
+share/gnome/help/xvidcap/it/figures/menu-make-video.png
+share/gnome/help/xvidcap/it/figures/menu-mf.png
+share/gnome/help/xvidcap/it/figures/menu-prefs.png
+share/gnome/help/xvidcap/it/figures/menu-quit.png
+share/gnome/help/xvidcap/it/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/it/figures/menu-sf.png
+share/gnome/help/xvidcap/it/figures/menu.png
+share/gnome/help/xvidcap/it/figures/pause-toggle.png
+share/gnome/help/xvidcap/it/figures/prefs-commands.png
+share/gnome/help/xvidcap/it/figures/prefs-general.png
+share/gnome/help/xvidcap/it/figures/prefs-mf.png
+share/gnome/help/xvidcap/it/figures/prefs-sf.png
+share/gnome/help/xvidcap/it/figures/record-toggle.png
+share/gnome/help/xvidcap/it/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/it/figures/results-dialog.png
+share/gnome/help/xvidcap/it/figures/selector-button.png
+share/gnome/help/xvidcap/it/figures/step-button.png
+share/gnome/help/xvidcap/it/figures/stop-toggle.png
+share/gnome/help/xvidcap/it/figures/xvidcap-ctrl.png
+share/gnome/help/xvidcap/it/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/it/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/it/xvidcap.xml
+share/locale/de/LC_MESSAGES/xvidcap.mo
+share/locale/en/LC_MESSAGES/xvidcap.mo
+share/locale/es/LC_MESSAGES/xvidcap.mo
+share/locale/it/LC_MESSAGES/xvidcap.mo
+share/omf/xvidcap/xvidcap-C.omf
+share/omf/xvidcap/xvidcap-de.omf
+share/omf/xvidcap/xvidcap-es.omf
+share/omf/xvidcap/xvidcap-it.omf
+share/pixmaps/xvidcap.png
+share/xvidcap/glade/gnome-xvidcap.glade
+share/xvidcap/glade/xvidcap_logo.png
+share/xvidcap/ppm2mpeg.sh
+share/xvidcap/xvidcap.desktop
+share/xvidcap/xvidcap.png

Index: pkgsrc/x11/xvidcap/distinfo
diff -u pkgsrc/x11/xvidcap/distinfo:1.12 pkgsrc/x11/xvidcap/distinfo:1.13
--- pkgsrc/x11/xvidcap/distinfo:1.12    Wed Nov  4 03:29:13 2015
+++ pkgsrc/x11/xvidcap/distinfo Thu Apr 23 14:31:12 2020
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 03:29:13 agc Exp $
+$NetBSD: distinfo,v 1.13 2020/04/23 14:31:12 nia Exp $
 
-SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
-RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
-SHA512 (xvidcap-1.1.3.tar.gz) = f43bbee7df6a06a61d5b04a32e13f38c1e2cf25a4b3a8572c7918b55a3138b9ad67759025fab9a20b9a5a673213f13b0248dadb7ccc89a280f344b31ede01850
-Size (xvidcap-1.1.3.tar.gz) = 1627036 bytes
-SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
-SHA1 (patch-ab) = a1b379bbca8ca8dcbad4363b8d37897d56cf16d5
-SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
-SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = 2ebab45421ab2782d48067f7b63e010190111397
-SHA1 (patch-af) = 52a10e0c278c956a3de8b77b8f89c4e1f28c6838
-SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
-SHA1 (patch-src_xtomng.c) = 474b082c94883fd367126e6835e91bfc856063b5
-SHA1 (patch-src_xtopng.c) = 5e4e8e7150ccb67e25a65ecf33e2900074fa1179
+SHA1 (xvidcap-1.1.7.tar.gz) = ccdf8ac85c76b202dbf46074df6b3844faf127d1
+RMD160 (xvidcap-1.1.7.tar.gz) = 782f0f8b4693bb3e96fdf06de71b2f6832b246e0
+SHA512 (xvidcap-1.1.7.tar.gz) = 9dc2e6751a0f9126dc81f24fca18430a57550b57eaad2e2cd782cc1a5274a7998b509b491d85db3a1302866583b48c36e65043608c453c0466fbbe3d1142bc42
+Size (xvidcap-1.1.7.tar.gz) = 4789924 bytes
+SHA1 (patch-configure) = 9a82ebbfd4fd6e7b1ad4567e346ce2c2860d1c9e
+SHA1 (patch-src_capture.c) = 1fc2f28c3a30a08eac799cb646d291472e99a10a

Added files:

Index: pkgsrc/x11/xvidcap/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xvidcap/patches/patch-configure:1.1
--- /dev/null   Thu Apr 23 14:31:12 2020
+++ pkgsrc/x11/xvidcap/patches/patch-configure  Thu Apr 23 14:31:12 2020
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2020/04/23 14:31:12 nia Exp $
+
+Don't pass invalid options to ffmpeg ./configure
+
+--- configure.orig     2008-07-09 07:28:25.000000000 +0000
++++ configure
+@@ -11273,14 +11273,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ test x$ac_cv_lib_mp3lame_lame_init = xyes && ac_my_ffmpeg_cfg_lib_switch="--enable-libmp3lame"
+-test x$ac_cv_lib_theora_theora_encode_init = xyes && ac_my_ffmpeg_cfg_lib_switch="${ac_my_ffmpeg_cfg_lib_switch} --enable-libogg --enable-libtheora"
++test x$ac_cv_lib_theora_theora_encode_init = xyes && ac_my_ffmpeg_cfg_lib_switch="${ac_my_ffmpeg_cfg_lib_switch} --enable-libtheora"
+ 
+ # if cache empty (not tested or failed) and want static avcodec (then it failed) ...
+ if ( `test \( \( x${ac_cv_lib_avutil_av_rescale+set} = x \) -a \( x$static_avutil = xyes \) \)` ) ; then
+       # build embedded ffmpeg
+       echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && \
+       ( cd ./ffmpeg/ && \
+-      ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay && \
++      ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay --disable-demuxer=v4l2 --disable-mmx && \
+       ln -s libavcodec/avcodec.h ./ && \
+       ln -s libavcodec/dsputil.h ./ && \
+       ln -s libavformat/avformat.h ./ && \
Index: pkgsrc/x11/xvidcap/patches/patch-src_capture.c
diff -u /dev/null pkgsrc/x11/xvidcap/patches/patch-src_capture.c:1.1
--- /dev/null   Thu Apr 23 14:31:12 2020
+++ pkgsrc/x11/xvidcap/patches/patch-src_capture.c      Thu Apr 23 14:31:12 2020
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_capture.c,v 1.1 2020/04/23 14:31:12 nia Exp $
+
+Fix build without SHMAT.
+
+--- src/capture.c.orig 2008-05-25 22:01:53.000000000 +0000
++++ src/capture.c
+@@ -647,6 +647,7 @@ XGetZPixmapToXImage (Display * dpy, Draw
+                         image->width, image->height);
+ }
+ 
++#ifdef HAVE_SHMAT
+ /**
+  * \brief reads data from the Xserver to a chunk of memory on the client.
+  *      This version uses shared memory access to X11.
+@@ -706,6 +707,7 @@ XGetZPixmapSHM (Display * dpy, Drawable 
+     return (True);
+ #undef DEBUGFUNCTION
+ }
++#endif
+ 
+ /**
+  * \brief copies a small image into another larger image
+@@ -1653,13 +1655,17 @@ commonCapture (enum captureFunctions cap
+                 XDestroyImage (image);
+                 image = NULL;
+             }
++#ifdef HAVE_SHMAT
+             if (capfunc == SHM)
+                 XShmDetach (app->dpy, &shminfo);
++#endif
+ 
+ #ifdef USE_XDAMAGE
+             if (app->flags & FLG_USE_XDAMAGE) {
++#ifdef HAVE_SHMAT
+                 if (capfunc == SHM)
+                     XShmDetach (app->dpy, &dmg_shminfo);
++#endif
+                 if (dmg_image)
+                     XDestroyImage (dmg_image);
+             }