Attachment 227565 Details for Bug 256818 – patch-configure

[patch] patch-configure

patch-configure (text/plain), 6.68 KB, created by Stefan Rumetshofer on 2021-08-31 07:06:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Rumetshofer

Created: 2021-08-31 07:06:59 UTC

Size: 6.68 KB

patch

obsolete

>diff -ruN b/configure a/configure
>--- b/configure	2012-05-11 09:37:27.000000000 +0200
>+++ a/configure	2021-08-31 08:43:00.871579000 +0200
>@@ -234,6 +234,7 @@
>   xrender
>   xshape
>   opengl
>+  glx
>   pthread
>   dlfcn
>   vdpau
>@@ -333,6 +334,7 @@
>   disabled x11     && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau
>   disabled vdr     && disable libextractor libcap libbluray
>   disabled dlfcn   && disable opengl
>+  disabled glx     && disable opengl
>   disabled pthread && disable opengl
>   disabled xrender && disable xshape xshm
> }
>@@ -349,11 +351,14 @@
> [ $debug = yes ] && \
>   test_library   X11  do_error     "none.h"         "-lnolib"
> 
>-test_library     VDR   libextractor "extractor.h"        "-lextractor" "EXTRACTOR_getKeywords(0,0)"
>-test_library     VDR   libcap       "sys/capability.h"   "-lcap"       "cap_get_proc()"
>-test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)"
>-test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)"
>-test_library     DLFCN dlfcn        "dlfcn.h"            "-ldl"        "dlopen(0,0)"
>+#test_library     VDR   libextractor "extractor.h"        "-lextractor" "EXTRACTOR_getKeywords(0,0)"
>+test_library     VDR   libextractor "extractor.h"      "-lextractor" "EXTRACTOR_getKeywords(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#test_library     VDR   libcap       "sys/capability.h"   "-lcap"       "cap_get_proc()"
>+#test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)"
>+test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)"
>+test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+test_library     DLFCN dlfcn        "dlfcn.h"            ""        "dlopen(0,0)"
> 
> if enabled libxine; then
> 
>@@ -365,24 +370,41 @@
>   fi
>   log " $XINEPLUGINDIR"
> 
>-  test_library   AVUTIL  libavutil    "libavutil/mem.h"        "-lavutil"    "av_mallocz(1)"
>-  test_library   JPEG    libjpeg      "jpeglib.h"              "-ljpeg"      "jpeg_create_compress(0)"
>-  test_library   X11     x11          "X11/X.h"                "-lX11"       "XInitThreads()"
>+#  test_library   AVUTIL  libavutil    "libavutil/mem.h"        "-lavutil"    "av_mallocz(1)"
>+  test_library   AVUTIL  libavutil    "libavutil/mem.h"        "-lavutil"    "av_mallocz(1)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#  test_library   JPEG    libjpeg      "jpeglib.h"              "-ljpeg"      "jpeg_create_compress(0)"
>+  test_library   JPEG    libjpeg      "jpeglib.h"              "-ljpeg"      "jpeg_create_compress(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#  test_library   X11     x11          "X11/X.h"                "-lX11"       "XInitThreads()"
>+  test_library   X11     x11          "X11/X.h"                "-lX11"       "XInitThreads()" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>   test_library   PTHREAD pthread      "pthread.h"              "-lpthread"   "pthread_create(0,0,0,0)"
>   if enabled x11; then
>-    test_library X11  xext         "X11/extensions/Xext.h"     "-lXext"      ""
>-    test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)"
>-    test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)"
>-    test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)"
>-    test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)"
>-    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
>-    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)"
>-    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
>+#    test_library X11  xext         "X11/extensions/Xext.h"     "-lXext"      ""
>+    test_library X11  xext         "X11/extensions/Xext.h"     "-lXext"      "" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)"
>+    test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)"
>+    test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)"
>+    test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)"
>+    test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
>+    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)"
>+    test_library X11  opengl       "GL/gl.h"                   "-lGL -LGLU"  "glTexCoord2f(0.0,0.0)"  "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+    test_library X11  glx          "GL/glx.h"                  "-lGLX"       "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
>+    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+#    test_library X11  dbus-glib-1  \
>+#      "dbus/dbus-glib.h" \
>+#      "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
>+#      "dbus_g_bus_get(0,0)" \
>+#      "-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include"
>     test_library X11  dbus-glib-1  \
>       "dbus/dbus-glib.h" \
>       "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
>       "dbus_g_bus_get(0,0)" \
>-      "-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include"
>+      "-I/usr/include/dbus-1.0 -I${LOCALBASE}/include/dbus-1.0 -I/usr/include/glib-2.0 -I${LOCALBASE}/include/glib-2.0 -L${LOCALBASE}/lib"
>   fi
> fi
>

Actions: View | Diff

Attachments on bug 256818: 226043 | 227565 | 227566 | 227567