Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
frmdstryr
wine
Commits
96d9a7de
Commit
96d9a7de
authored
11 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Use the pkg-config helper macro for gstreamer.
parent
100806e4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+36
-19
36 additions, 19 deletions
configure
configure.ac
+15
-17
15 additions, 17 deletions
configure.ac
dlls/winegstreamer/Makefile.in
+1
-1
1 addition, 1 deletion
dlls/winegstreamer/Makefile.in
with
52 additions
and
37 deletions
configure
+
36
−
19
View file @
96d9a7de
...
...
@@ -646,8 +646,8 @@ FONTCONFIGINCL
CUPSINCL
OSS4INCL
ALSALIBS
GSTREAMER_INCL
GSTREAMER_LIBS
GSTREAMER_CFLAGS
LIBGETTEXTPO
ZLIB
FREETYPE_LIBS
...
...
@@ -875,7 +875,9 @@ SANE_LIBS
GPHOTO2_CFLAGS
GPHOTO2_LIBS
FREETYPE_CFLAGS
FREETYPE_LIBS'
FREETYPE_LIBS
GSTREAMER_CFLAGS
GSTREAMER_LIBS'
# Initialize some variables set by options.
...
...
@@ -1584,6 +1586,10 @@ Some influential environment variables:
C compiler flags for freetype2, overriding pkg-config
FREETYPE_LIBS
Linker flags for freetype2, overriding pkg-config
GSTREAMER_CFLAGS
C compiler flags for gstreamer-app-0.10, overriding pkg-config
GSTREAMER_LIBS
Linker flags for gstreamer-app-0.10, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
...
...
@@ -11131,17 +11137,30 @@ fi
if test "x$with_gstreamer" != "xno"
then
ac_save_CPPFLAGS="$CPPFLAGS"
if test "$PKG_CONFIG" != "false"; then
ac_gst_incl=""
for i in `$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null`
do
case "$i" in
-I*) ac_gst_incl="$ac_gst_incl $i";;
esac
done
ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`"
CPPFLAGS="$CPPFLAGS $ac_gst_incl"
ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default"
if test -n "$GSTREAMER_CFLAGS"; then :
elif test -n "$PKG_CONFIG"; then :
GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null`
fi
CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
if test -n "$GSTREAMER_LIBS"; then :
elif test -n "$PKG_CONFIG"; then :
GSTREAMER_LIBS=`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`
fi
ac_gst_incl=""
for i in $GSTREAMER_CFLAGS
do
case "$i" in
-I*) ac_gst_incl="$ac_gst_incl $i";;
esac
done
GSTREAMER_CFLAGS=$ac_gst_incl
CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default"
if test "x$ac_cv_header_gst_gstpad_h" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default"
if test "x$ac_cv_header_gst_app_gstappsink_h" = xyes; then :
...
...
@@ -11204,7 +11223,7 @@ if ${ac_cv_lib_gstapp_0_10_gst_app_buffer_new+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgstapp-0.10 $
ac_gst_libs
$LIBS"
LIBS="-lgstapp-0.10 $
GSTREAMER_LIBS
$LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
...
...
@@ -11235,10 +11254,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&5
$as_echo "$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&6; }
if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes; then :
GSTREAMER_LIBS="$ac_gst_libs"
GSTREAMER_INCL="$ac_gst_incl"
:
fi
fi
...
...
@@ -11251,10 +11267,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
else
GSTREAMER_CFLAGS=""
fi
fi
CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then :
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
15
−
17
View file @
96d9a7de
...
...
@@ -1536,28 +1536,26 @@ dnl **** Check for gstreamer ****
if test "x$with_gstreamer" != "xno"
then
ac_save_CPPFLAGS="$CPPFLAGS"
if test "$PKG_CONFIG" != "false"; then
ac_gst_incl=""
for i in
`$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null`
do
case "$i" in
-I*) ac_gst_incl="$ac_gst_incl $i";;
esac
done
ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`"
CPPFLAGS="$CPPFLAGS $
ac_gst_incl
"
AC_CHECK_HEADER([gst/gstpad.h],
[AC_CHECK_HEADER([gst/app/gstappsink.h],
WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-app-0.10])
ac_gst_incl=""
for i in
$GSTREAMER_CFLAGS
do
case "$i" in
-I*) ac_gst_incl="$ac_gst_incl $i";;
esac
done
GSTREAMER_CFLAGS=$ac_gst_incl
CPPFLAGS="$
ac_save_
CPPFLAGS $
GSTREAMER_CFLAGS
"
AC_CHECK_HEADER([gst/gstpad.h],
[AC_CHECK_HEADER([gst/app/gstappsink.h],
[AC_MSG_CHECKING([whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/app/gstappsink.h>]],
[[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
[AC_MSG_RESULT([yes])
AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed,
[AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new,
[AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs")
AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])])],
[AC_MSG_RESULT([no])])])])
fi
[AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new,[:],,[$GSTREAMER_LIBS])])],
[AC_MSG_RESULT([no])])])],
[GSTREAMER_CFLAGS=""])
CPPFLAGS="$ac_save_CPPFLAGS"
fi
WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes],
...
...
This diff is collapsed.
Click to expand it.
dlls/winegstreamer/Makefile.in
+
1
−
1
View file @
96d9a7de
MODULE
=
winegstreamer.dll
IMPORTS
=
strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32
EXTRAINCL
=
@GSTREAMER_
INCL
@
EXTRAINCL
=
@GSTREAMER_
CFLAGS
@
EXTRALIBS
=
@GSTREAMER_LIBS@ @LIBPTHREAD@
C_SRCS
=
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment