diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-10-05 06:47:54 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-10-05 06:47:54 +0800 |
commit | 7539cc4fca5d8bb189229a9e0c03ef34565f3edf (patch) | |
tree | b0f687a37d1cab755f4fc5eb358bee474684fc3d /multimedia | |
parent | 169cfa2690cd0c4ca48b10d191a2956e3b12080e (diff) | |
download | marcuscom-ports-7539cc4fca5d8bb189229a9e0c03ef34565f3edf.tar.gz marcuscom-ports-7539cc4fca5d8bb189229a9e0c03ef34565f3edf.tar.zst marcuscom-ports-7539cc4fca5d8bb189229a9e0c03ef34565f3edf.zip |
Update to 3.2.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16363 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/cheese3/Makefile | 8 | ||||
-rw-r--r-- | multimedia/cheese3/distinfo | 4 | ||||
-rw-r--r-- | multimedia/cheese3/files/patch-configure | 206 | ||||
-rw-r--r-- | multimedia/cheese3/pkg-plist | 28 |
4 files changed, 212 insertions, 34 deletions
diff --git a/multimedia/cheese3/Makefile b/multimedia/cheese3/Makefile index 494939206..0a184b6bb 100644 --- a/multimedia/cheese3/Makefile +++ b/multimedia/cheese3/Makefile @@ -3,11 +3,11 @@ # Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/cheese3/Makefile,v 1.10 2011/08/31 08:20:28 kwm Exp $ +# $MCom: ports/multimedia/cheese3/Makefile,v 1.11 2011/09/18 10:34:20 kwm Exp $ # PORTNAME= cheese -PORTVERSION= 3.1.91.1 +PORTVERSION= 3.2.0 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -39,8 +39,8 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" DOCS= AUTHORS COPYING ChangeLog NEWS README GLIB_SCHEMAS= org.gnome.Cheese.gschema.xml diff --git a/multimedia/cheese3/distinfo b/multimedia/cheese3/distinfo index 4e6125c6e..9dbf3a52f 100644 --- a/multimedia/cheese3/distinfo +++ b/multimedia/cheese3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cheese-3.1.91.1.tar.xz) = d29a0ee92f7877a10a9f834784e9f9239eaa51eb506b1fa47cd0619e98bb957b -SIZE (gnome3/cheese-3.1.91.1.tar.xz) = 3479512 +SHA256 (gnome3/cheese-3.2.0.tar.xz) = 04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b +SIZE (gnome3/cheese-3.2.0.tar.xz) = 3492168 diff --git a/multimedia/cheese3/files/patch-configure b/multimedia/cheese3/files/patch-configure index 9162c8443..d58409b3c 100644 --- a/multimedia/cheese3/files/patch-configure +++ b/multimedia/cheese3/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2011-04-26 00:51:10.000000000 +0200 -+++ configure 2011-04-27 18:08:02.000000000 +0200 -@@ -715,7 +715,10 @@ CHEESE_CFLAGS +--- configure.orig 2011-09-20 14:42:00.000000000 +0200 ++++ configure 2011-09-20 14:42:06.000000000 +0200 +@@ -724,7 +724,10 @@ HAVE_XTEST_FALSE HAVE_XTEST_TRUE XTEST_LIBS @@ -11,7 +11,7 @@ UDEV_LIBS UDEV_CFLAGS PKG_CONFIG_LIBDIR -@@ -923,6 +926,8 @@ PKG_CONFIG_PATH +@@ -917,6 +920,8 @@ PKG_CONFIG_LIBDIR UDEV_CFLAGS UDEV_LIBS @@ -20,7 +20,7 @@ CHEESE_CFLAGS CHEESE_LIBS CHEESE_GTK_CFLAGS -@@ -1605,6 +1610,8 @@ Some influential environment variables: +@@ -1595,6 +1600,8 @@ path overriding pkg-config's built-in search path UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config UDEV_LIBS linker flags for UDEV, overriding pkg-config @@ -29,7 +29,72 @@ CHEESE_CFLAGS C compiler flags for CHEESE, overriding pkg-config CHEESE_LIBS linker flags for CHEESE, overriding pkg-config -@@ -15039,6 +15046,82 @@ $as_echo "#define HAVE_UDEV 1" >>confdef +@@ -10986,14 +10993,7 @@ + *) objformat=elf ;; + esac + fi +- # Handle Gentoo/FreeBSD as it was Linux +- case $host_vendor in +- gentoo) +- version_type=linux ;; +- *) +- version_type=freebsd-$objformat ;; +- esac +- ++ version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -11004,12 +11004,6 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; +- linux) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- need_lib_prefix=no +- need_version=no +- ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +@@ -12951,7 +12945,6 @@ + + + +- + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +@@ -13080,7 +13073,6 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -13097,7 +13089,6 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -13117,9 +13108,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-1.0" 2>&1` ++ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0" 2>&1` + else +- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-1.0" 2>&1` ++ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$UDEV_PKG_ERRORS" >&5 +@@ -13140,6 +13131,82 @@ UDEV_PKG=gudev-1.0 fi @@ -112,7 +177,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5 $as_echo_n "checking operating system... " >&6; } case $host in -@@ -15053,6 +15136,17 @@ $as_echo "Linux" >&6; } +@@ -13154,6 +13221,17 @@ as_fn_error $? "libgudev is required under Linux and not installed" "$LINENO" 5 fi ;; @@ -130,7 +195,7 @@ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported operating system" >&5 $as_echo "unsupported operating system" >&6; } -@@ -15154,7 +15248,8 @@ if test -n "$CHEESE_CFLAGS"; then +@@ -13257,7 +13335,8 @@ clutter-1.0 >= \$CLUTTER_REQUIRED \\ clutter-gst-1.0 >= \$CLUTTERGST_REQUIRED \\ mx-1.0 \\ @@ -140,7 +205,7 @@ \""; } >&5 ($PKG_CONFIG --exists --print-errors "\ glib-2.0 >= $GLIB_REQUIRED \ -@@ -15167,7 +15262,8 @@ if test -n "$CHEESE_CFLAGS"; then +@@ -13272,7 +13351,8 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -150,7 +215,7 @@ ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -15183,7 +15279,8 @@ if test -n "$CHEESE_CFLAGS"; then +@@ -13290,9 +13370,9 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -158,9 +223,11 @@ + $UDEV_PKG \ + $HAL_PKG " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -15206,7 +15303,8 @@ if test -n "$CHEESE_LIBS"; then + fi +@@ -13316,7 +13396,8 @@ clutter-1.0 >= \$CLUTTER_REQUIRED \\ clutter-gst-1.0 >= \$CLUTTERGST_REQUIRED \\ mx-1.0 \\ @@ -170,7 +237,7 @@ \""; } >&5 ($PKG_CONFIG --exists --print-errors "\ glib-2.0 >= $GLIB_REQUIRED \ -@@ -15219,7 +15317,8 @@ if test -n "$CHEESE_LIBS"; then +@@ -13331,7 +13412,8 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -180,7 +247,7 @@ ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -15235,7 +15334,8 @@ if test -n "$CHEESE_LIBS"; then +@@ -13349,9 +13431,9 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -188,9 +255,20 @@ + $UDEV_PKG \ + $HAL_PKG " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -15267,7 +15367,8 @@ fi + fi +@@ -13371,7 +13453,7 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- CHEESE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "\ ++ CHEESE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GIO_REQUIRED \ + x11 \ +@@ -13384,10 +13466,11 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -199,8 +277,12 @@ + $HAL_PKG " 2>&1` else - CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ -@@ -15281,7 +15382,8 @@ fi +- CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "\ ++ CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GIO_REQUIRED \ + x11 \ +@@ -13400,7 +13483,8 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -210,7 +292,7 @@ " 2>&1` fi # Put the nasty error message in config.log where it belongs -@@ -15298,7 +15400,8 @@ fi +@@ -13419,7 +13503,8 @@ clutter-1.0 >= $CLUTTER_REQUIRED \ clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \ mx-1.0 \ @@ -220,7 +302,7 @@ ) were not met: $CHEESE_PKG_ERRORS -@@ -15354,6 +15457,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then +@@ -13475,6 +13560,7 @@ gee-1.0 >= \$GEE_REQUIRED \\ libcanberra-gtk3 >= \$LIBCANBERRA_REQUIRED \\ \$UDEV_PKG \\ @@ -228,7 +310,7 @@ gnome-video-effects \""; } >&5 ($PKG_CONFIG --exists --print-errors "\ -@@ -15366,6 +15470,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then +@@ -13487,6 +13573,7 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ @@ -236,15 +318,18 @@ gnome-video-effects ") 2>&5 ac_status=$? -@@ -15381,6 +15486,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then +@@ -13502,9 +13589,9 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ + $HAL_PKG \ gnome-video-effects " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes else -@@ -15403,6 +15509,7 @@ if test -n "$CHEESE_GTK_LIBS"; then + pkg_failed=yes + fi +@@ -13525,6 +13612,7 @@ gee-1.0 >= \$GEE_REQUIRED \\ libcanberra-gtk3 >= \$LIBCANBERRA_REQUIRED \\ \$UDEV_PKG \\ @@ -252,7 +337,7 @@ gnome-video-effects \""; } >&5 ($PKG_CONFIG --exists --print-errors "\ -@@ -15415,6 +15522,7 @@ if test -n "$CHEESE_GTK_LIBS"; then +@@ -13537,6 +13625,7 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ @@ -260,15 +345,27 @@ gnome-video-effects ") 2>&5 ac_status=$? -@@ -15430,6 +15538,7 @@ if test -n "$CHEESE_GTK_LIBS"; then +@@ -13552,9 +13641,9 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ + $HAL_PKG \ gnome-video-effects " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes else -@@ -15461,6 +15570,7 @@ fi + pkg_failed=yes + fi +@@ -13574,7 +13663,7 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "\ ++ CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + gio-2.0 >= $GIO_REQUIRED \ + gtk+-3.0 >= $GTK_REQUIRED \ + gdk-3.0 >= $GDK_REQUIRED \ +@@ -13584,10 +13673,11 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ @@ -276,7 +373,12 @@ gnome-video-effects " 2>&1` else -@@ -15474,6 +15584,7 @@ fi +- CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "\ ++ CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + gio-2.0 >= $GIO_REQUIRED \ + gtk+-3.0 >= $GTK_REQUIRED \ + gdk-3.0 >= $GDK_REQUIRED \ +@@ -13597,6 +13687,7 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ @@ -284,7 +386,7 @@ gnome-video-effects " 2>&1` fi -@@ -15490,6 +15601,7 @@ fi +@@ -13613,6 +13704,7 @@ gee-1.0 >= $GEE_REQUIRED \ libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \ $UDEV_PKG \ @@ -292,3 +394,55 @@ gnome-video-effects ) were not met: +@@ -13909,6 +14001,7 @@ + else + as_fn_error $? "You need to have gtk-doc >= 1.14 installed to build $PACKAGE_NAME" "$LINENO" 5 + fi ++ if test "x$PACKAGE_NAME" != "xglib"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +@@ -13924,7 +14017,6 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -13941,7 +14033,6 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -13961,9 +14052,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` ++ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else +- GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` ++ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 +@@ -14000,6 +14091,7 @@ + $as_echo "yes" >&6; } + + fi ++ fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +@@ -14178,7 +14270,6 @@ + + + +- + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. diff --git a/multimedia/cheese3/pkg-plist b/multimedia/cheese3/pkg-plist index b894474ca..5223bb14e 100644 --- a/multimedia/cheese3/pkg-plist +++ b/multimedia/cheese3/pkg-plist @@ -57,7 +57,6 @@ share/applications/cheese.desktop %%DOCSDIR%%/README %%DOCSDIR%%/api-index-full.html %%DOCSDIR%%/ch01.html -%%DOCSDIR%%/cheese.devhelp %%DOCSDIR%%/cheese.devhelp2 %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html @@ -284,6 +283,30 @@ share/gnome/help/cheese/fr/save-photo.page share/gnome/help/cheese/fr/take-photo.page share/gnome/help/cheese/fr/view-photo.page share/gnome/help/cheese/fr/wide-mode.page +share/gnome/help/cheese/gl/apply-effects.page +share/gnome/help/cheese/gl/burst-mode.page +share/gnome/help/cheese/gl/delete-photo.page +share/gnome/help/cheese/gl/disable-countdown.page +share/gnome/help/cheese/gl/disable-flash.page +share/gnome/help/cheese/gl/figures/cheese-delete.png +share/gnome/help/cheese/gl/figures/cheese-effects.png +share/gnome/help/cheese/gl/figures/cheese-introduction.png +share/gnome/help/cheese/gl/figures/cheese-record.png +share/gnome/help/cheese/gl/figures/cheese-save.png +share/gnome/help/cheese/gl/figures/cheese-take.png +share/gnome/help/cheese/gl/figures/cheese.png +share/gnome/help/cheese/gl/figures/effects.png +share/gnome/help/cheese/gl/figures/image-properties.png +share/gnome/help/cheese/gl/figures/settings.png +share/gnome/help/cheese/gl/image-properties.page +share/gnome/help/cheese/gl/index.page +share/gnome/help/cheese/gl/introduction.page +share/gnome/help/cheese/gl/record-video.page +share/gnome/help/cheese/gl/resolution-photo.page +share/gnome/help/cheese/gl/save-photo.page +share/gnome/help/cheese/gl/take-photo.page +share/gnome/help/cheese/gl/view-photo.page +share/gnome/help/cheese/gl/wide-mode.page share/gnome/help/cheese/it/apply-effects.page share/gnome/help/cheese/it/burst-mode.page share/gnome/help/cheese/it/delete-photo.page @@ -554,7 +577,6 @@ share/icons/hicolor/24x24/apps/cheese.png share/icons/hicolor/256x256/apps/cheese.png share/icons/hicolor/32x32/apps/cheese.png share/icons/hicolor/48x48/apps/cheese.png -share/icons/hicolor/scalable/apps/cheese.svg share/locale/af/LC_MESSAGES/cheese.mo share/locale/ar/LC_MESSAGES/cheese.mo share/locale/as/LC_MESSAGES/cheese.mo @@ -656,6 +678,8 @@ share/locale/zu/LC_MESSAGES/cheese.mo @dirrm share/gnome/help/cheese/ko @dirrm share/gnome/help/cheese/it/figures @dirrm share/gnome/help/cheese/it +@dirrm share/gnome/help/cheese/gl/figures +@dirrm share/gnome/help/cheese/gl @dirrm share/gnome/help/cheese/fr/figures @dirrm share/gnome/help/cheese/fr @dirrm share/gnome/help/cheese/fi/figures |