166 lines
6.3 KiB
Plaintext
166 lines
6.3 KiB
Plaintext
$OpenBSD: patch-configure,v 1.15 2012/09/29 12:20:14 ajacoutot Exp $
|
|
|
|
From 86eb47f705b2f0e6e8ba8d90073c961d47dbfb95 Mon Sep 17 00:00:00 2001
|
|
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
|
Date: Fri, 17 Aug 2012 13:28:05 +0000
|
|
Subject: grilo: Port to the grilo 0.2 API
|
|
|
|
audiocd plugin requires cdda support in gvfs which we do not provide as
|
|
this would require HAL or gudev.
|
|
|
|
--- configure.orig Sun Jun 3 11:07:09 2012
|
|
+++ configure Sat Sep 29 14:06:22 2012
|
|
@@ -15085,7 +15085,7 @@ LIBSOUP_REQS=2.26.0
|
|
GUDEV_REQS=143
|
|
LIBMTP_REQS=0.3.0
|
|
LIBPEAS_REQS=0.7.3
|
|
-GRILO_REQS=0.1.17
|
|
+GRILO_REQS=0.2.0
|
|
LIBXML2_REQS=2.7.8
|
|
|
|
LIBNOTIFY_REQS=0.7.0
|
|
@@ -16851,99 +16851,6 @@ fi
|
|
|
|
|
|
|
|
-pkg_failed=no
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTCDDA" >&5
|
|
-$as_echo_n "checking for GSTCDDA... " >&6; }
|
|
-
|
|
-if test -n "$GSTCDDA_CFLAGS"; then
|
|
- pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS"
|
|
- elif test -n "$PKG_CONFIG"; then
|
|
- if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }; then
|
|
- pkg_cv_GSTCDDA_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-cdda-0.10" 2>/dev/null`
|
|
-else
|
|
- pkg_failed=yes
|
|
-fi
|
|
- else
|
|
- pkg_failed=untried
|
|
-fi
|
|
-if test -n "$GSTCDDA_LIBS"; then
|
|
- pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS"
|
|
- elif test -n "$PKG_CONFIG"; then
|
|
- if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }; then
|
|
- pkg_cv_GSTCDDA_LIBS=`$PKG_CONFIG --libs "gstreamer-cdda-0.10" 2>/dev/null`
|
|
-else
|
|
- pkg_failed=yes
|
|
-fi
|
|
- else
|
|
- pkg_failed=untried
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-if test $pkg_failed = yes; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-
|
|
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
- _pkg_short_errors_supported=yes
|
|
-else
|
|
- _pkg_short_errors_supported=no
|
|
-fi
|
|
- if test $_pkg_short_errors_supported = yes; then
|
|
- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-cdda-0.10" 2>&1`
|
|
- else
|
|
- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-cdda-0.10" 2>&1`
|
|
- fi
|
|
- # Put the nasty error message in config.log where it belongs
|
|
- echo "$GSTCDDA_PKG_ERRORS" >&5
|
|
-
|
|
- as_fn_error $? "Package requirements (gstreamer-cdda-0.10) were not met:
|
|
-
|
|
-$GSTCDDA_PKG_ERRORS
|
|
-
|
|
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
-installed software in a non-standard prefix.
|
|
-
|
|
-Alternatively, you may set the environment variables GSTCDDA_CFLAGS
|
|
-and GSTCDDA_LIBS to avoid the need to call pkg-config.
|
|
-See the pkg-config man page for more details." "$LINENO" 5
|
|
-
|
|
-elif test $pkg_failed = untried; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
|
|
-is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
-path to pkg-config.
|
|
-
|
|
-Alternatively, you may set the environment variables GSTCDDA_CFLAGS
|
|
-and GSTCDDA_LIBS to avoid the need to call pkg-config.
|
|
-See the pkg-config man page for more details.
|
|
-
|
|
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
|
-See \`config.log' for more details" "$LINENO" 5; }
|
|
-
|
|
-else
|
|
- GSTCDDA_CFLAGS=$pkg_cv_GSTCDDA_CFLAGS
|
|
- GSTCDDA_LIBS=$pkg_cv_GSTCDDA_LIBS
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
-
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
have_sj_metadata_getter=no
|
|
# Check whether --enable-musicbrainz was given.
|
|
if test "${enable_musicbrainz+set}" = set; then :
|
|
@@ -20437,12 +20344,12 @@ if test -n "$GRILO_CFLAGS"; then
|
|
pkg_cv_GRILO_CFLAGS="$GRILO_CFLAGS"
|
|
elif test -n "$PKG_CONFIG"; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.1 >= \$GRILO_REQS\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "grilo-0.1 >= $GRILO_REQS") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_GRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.1 >= $GRILO_REQS" 2>/dev/null`
|
|
+ pkg_cv_GRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.2 >= $GRILO_REQS" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -20453,12 +20360,12 @@ if test -n "$GRILO_LIBS"; then
|
|
pkg_cv_GRILO_LIBS="$GRILO_LIBS"
|
|
elif test -n "$PKG_CONFIG"; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.1 >= \$GRILO_REQS\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "grilo-0.1 >= $GRILO_REQS") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_GRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.1 >= $GRILO_REQS" 2>/dev/null`
|
|
+ pkg_cv_GRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.2 >= $GRILO_REQS" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -20478,9 +20385,9 @@ else
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- GRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "grilo-0.1 >= $GRILO_REQS" 2>&1`
|
|
+ GRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "grilo-0.2 >= $GRILO_REQS" 2>&1`
|
|
else
|
|
- GRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors "grilo-0.1 >= $GRILO_REQS" 2>&1`
|
|
+ GRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors "grilo-0.2 >= $GRILO_REQS" 2>&1`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$GRILO_PKG_ERRORS" >&5
|