View | Details | Raw Unified | Return to bug 256818 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure (-17 / +39 lines)
Lines 234-239 Link Here
234
  xrender
234
  xrender
235
  xshape
235
  xshape
236
  opengl
236
  opengl
237
  glx
237
  pthread
238
  pthread
238
  dlfcn
239
  dlfcn
239
  vdpau
240
  vdpau
Lines 333-338 Link Here
333
  disabled x11     && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau
334
  disabled x11     && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau
334
  disabled vdr     && disable libextractor libcap libbluray
335
  disabled vdr     && disable libextractor libcap libbluray
335
  disabled dlfcn   && disable opengl
336
  disabled dlfcn   && disable opengl
337
  disabled glx     && disable opengl
336
  disabled pthread && disable opengl
338
  disabled pthread && disable opengl
337
  disabled xrender && disable xshape xshm
339
  disabled xrender && disable xshape xshm
338
}
340
}
Lines 349-359 Link Here
349
[ $debug = yes ] && \
351
[ $debug = yes ] && \
350
  test_library   X11  do_error     "none.h"         "-lnolib"
352
  test_library   X11  do_error     "none.h"         "-lnolib"
351
353
352
test_library     VDR   libextractor "extractor.h"        "-lextractor" "EXTRACTOR_getKeywords(0,0)"
354
#test_library     VDR   libextractor "extractor.h"        "-lextractor" "EXTRACTOR_getKeywords(0,0)"
353
test_library     VDR   libcap       "sys/capability.h"   "-lcap"       "cap_get_proc()"
355
test_library     VDR   libextractor "extractor.h"      "-lextractor" "EXTRACTOR_getKeywords(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
354
test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)"
356
#test_library     VDR   libcap       "sys/capability.h"   "-lcap"       "cap_get_proc()"
355
test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)"
357
#test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)"
356
test_library     DLFCN dlfcn        "dlfcn.h"            "-ldl"        "dlopen(0,0)"
358
test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
359
#test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)"
360
test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
361
test_library     DLFCN dlfcn        "dlfcn.h"            ""        "dlopen(0,0)"
357
362
358
if enabled libxine; then
363
if enabled libxine; then
359
364
Lines 365-388 Link Here
365
  fi
370
  fi
366
  log " $XINEPLUGINDIR"
371
  log " $XINEPLUGINDIR"
367
372
368
  test_library   AVUTIL  libavutil    "libavutil/mem.h"        "-lavutil"    "av_mallocz(1)"
373
#  test_library   AVUTIL  libavutil    "libavutil/mem.h"        "-lavutil"    "av_mallocz(1)"
369
  test_library   JPEG    libjpeg      "jpeglib.h"              "-ljpeg"      "jpeg_create_compress(0)"
374
  test_library   AVUTIL  libavutil    "libavutil/mem.h"        "-lavutil"    "av_mallocz(1)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
370
  test_library   X11     x11          "X11/X.h"                "-lX11"       "XInitThreads()"
375
#  test_library   JPEG    libjpeg      "jpeglib.h"              "-ljpeg"      "jpeg_create_compress(0)"
376
  test_library   JPEG    libjpeg      "jpeglib.h"              "-ljpeg"      "jpeg_create_compress(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
377
#  test_library   X11     x11          "X11/X.h"                "-lX11"       "XInitThreads()"
378
  test_library   X11     x11          "X11/X.h"                "-lX11"       "XInitThreads()" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
371
  test_library   PTHREAD pthread      "pthread.h"              "-lpthread"   "pthread_create(0,0,0,0)"
379
  test_library   PTHREAD pthread      "pthread.h"              "-lpthread"   "pthread_create(0,0,0,0)"
372
  if enabled x11; then
380
  if enabled x11; then
373
    test_library X11  xext         "X11/extensions/Xext.h"     "-lXext"      ""
381
#    test_library X11  xext         "X11/extensions/Xext.h"     "-lXext"      ""
374
    test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)"
382
    test_library X11  xext         "X11/extensions/Xext.h"     "-lXext"      "" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
375
    test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)"
383
#    test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)"
376
    test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)"
384
    test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
377
    test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)"
385
#    test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)"
378
    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
386
    test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
379
    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)"
387
#    test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)"
380
    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
388
    test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
389
#    test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)"
390
    test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
391
#    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
392
    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
393
#    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)"
394
    test_library X11  opengl       "GL/gl.h"                   "-lGL -LGLU"  "glTexCoord2f(0.0,0.0)"  "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
395
    test_library X11  glx          "GL/glx.h"                  "-lGLX"       "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
396
#    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
397
    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
398
#    test_library X11  dbus-glib-1  \
399
#      "dbus/dbus-glib.h" \
400
#      "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
401
#      "dbus_g_bus_get(0,0)" \
402
#      "-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"
381
    test_library X11  dbus-glib-1  \
403
    test_library X11  dbus-glib-1  \
382
      "dbus/dbus-glib.h" \
404
      "dbus/dbus-glib.h" \
383
      "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
405
      "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
384
      "dbus_g_bus_get(0,0)" \
406
      "dbus_g_bus_get(0,0)" \
385
      "-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"
407
      "-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"
386
  fi
408
  fi
387
fi
409
fi
388
410

Return to bug 256818