cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to cheese-2.24.1

Browse Source 
note that until gstreamer v4l2 support is fixed, this port stays not
functionnal (robert? ;-))
This commit is contained in:
ajacoutot 2008-11-14 16:18:00 +00:00
parent e24faf6a9b
commit 1dbeef6b9f
5 changed files with 150 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gnome/cheese/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2008/11/14 16:18:00 ajacoutot Exp $
COMMENT= PhotoBooth inspired application
GNOME_PROJECT= cheese
GNOME_VERSION= 2.22.3
GNOME_VERSION= 2.24.1
CATEGORIES= multimedia
@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
Xrender Xxf86vm art_lgpl_2 asn1 atk-1.0 audiofile \
Xrender art_lgpl_2 asn1 atk-1.0 audiofile \
bonobo-2 bonobo-activation bonoboui-2 bz2 c cairo \
com_err croco-0.6 crypto db dbus-1 dbus-glib-1 esd \
expat fontconfig freetype gailutil gconf-2 gdk-x11-2.0 \

10
x11/gnome/cheese/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/cheese-2.22.3.tar.bz2) = IcI+KJscihrgFHBNYVqVQA==
RMD160 (gnome/cheese-2.22.3.tar.bz2) = y7YDB0Gzommm8cLuAAdJYVzqqJU=
SHA1 (gnome/cheese-2.22.3.tar.bz2) = gR35nHLwMcLrprLrBjCDVBJ/qig=
SHA256 (gnome/cheese-2.22.3.tar.bz2) = rCA5uqnMTMHQeUwAOkDaHZ2EuaWBvnocdhjC6IGZXFI=
SIZE (gnome/cheese-2.22.3.tar.bz2) = 1527967
MD5 (gnome/cheese-2.24.1.tar.bz2) = f1G1ziRJLbh5jNnRmWZ/fw==
RMD160 (gnome/cheese-2.24.1.tar.bz2) = VA1cHlJ9LxqSY5IQ4JFMtRblgl8=
SHA1 (gnome/cheese-2.24.1.tar.bz2) = vqcJHOVqammGKrgdSP6LkEkAypg=
SHA256 (gnome/cheese-2.24.1.tar.bz2) = myh7elitKH0dGBKgtQExeOUFvk0IHRejuBQlkxjSOf8=
SIZE (gnome/cheese-2.24.1.tar.bz2) = 2758801

99
x11/gnome/cheese/patches/patch-configure
View File

@ -1,91 +1,98 @@
$OpenBSD: patch-configure,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp $
--- configure.orig Tue Aug 26 14:39:36 2008
+++ configure Tue Aug 26 14:39:58 2008
@@ -23850,7 +23850,6 @@ CAIRO_REQUIRED=1.2.4
$OpenBSD: patch-configure,v 1.2 2008/11/14 16:18:00 ajacoutot Exp $
--- configure.orig Mon Oct 20 18:02:12 2008
+++ configure Fri Nov 14 17:03:03 2008
@@ -15385,13 +15385,12 @@ GTK_REQUIRED=2.10.0
GDK_REQUIRED=2.12.0
LIBGNOMEUI_REQUIRED=2.20.0
GCONF_REQUIRED=2.16.0
-GSTREAMER_REQUIRED=0.10.20
+GSTREAMER_REQUIRED=0.10.19
GNOME_VFS_REQUIRED=2.18.0
LIBEBOOK_REQUIRED=1.12.0
CAIRO_REQUIRED=1.4.0
DBUS_REQUIRED=1.0
-HAL_REQUIRED=0.5.9
DBUS_GLIB_REQUIRED=0.7
LIBRSVG_REQUIRED=2.18.0
-HAL_REQUIRED=0.5.9
PANGOCAIRO_REQUIRED=1.18.0
@@ -23877,7 +23876,6 @@ if test -n "$PKG_CONFIG"; then
libebook-1.2 >= \$LIBEBOOK_REQUIRED \\
LIBRSVG_REQUIRED=2.18.0
@@ -15419,7 +15418,6 @@ if test -n "$CHEESE_CFLAGS"; then
cairo >= \$CAIRO_REQUIRED \\
dbus-1 >= \$DBUS_REQUIRED \\
- hal >= \$HAL_REQUIRED \\
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\
- hal >= \$HAL_REQUIRED \\
pangocairo >= \$PANGOCAIRO_REQUIRED \\
librsvg-2.0 >= \$LIBRSVG_REQUIRED \\
@@ -23894,7 +23892,6 @@ if test -n "$PKG_CONFIG"; then
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= \$LIBRSVG_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "\
@@ -15437,7 +15435,6 @@ if test -n "$CHEESE_CFLAGS"; then
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -23914,7 +23911,6 @@ if test -n "$PKG_CONFIG"; then
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED") 2>&5
ac_status=$?
@@ -15458,7 +15455,6 @@ if test -n "$CHEESE_CFLAGS"; then
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -23943,7 +23939,6 @@ if test -n "$PKG_CONFIG"; then
libebook-1.2 >= \$LIBEBOOK_REQUIRED \\
librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>/dev/null`
else
@@ -15486,7 +15482,6 @@ if test -n "$CHEESE_LIBS"; then
cairo >= \$CAIRO_REQUIRED \\
dbus-1 >= \$DBUS_REQUIRED \\
- hal >= \$HAL_REQUIRED \\
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\
- hal >= \$HAL_REQUIRED \\
pangocairo >= \$PANGOCAIRO_REQUIRED \\
librsvg-2.0 >= \$LIBRSVG_REQUIRED \\
@@ -23960,7 +23955,6 @@ if test -n "$PKG_CONFIG"; then
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= \$LIBRSVG_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "\
@@ -15504,7 +15499,6 @@ if test -n "$CHEESE_LIBS"; then
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -23980,7 +23974,6 @@ if test -n "$PKG_CONFIG"; then
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED") 2>&5
ac_status=$?
@@ -15525,7 +15519,6 @@ if test -n "$CHEESE_LIBS"; then
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -24015,7 +24008,6 @@ fi
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>/dev/null`
else
@@ -15560,7 +15553,6 @@ fi
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -24033,7 +24025,6 @@ fi
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>&1`
else
@@ -15579,7 +15571,6 @@ fi
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -24054,7 +24045,6 @@ fi
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>&1`
fi
@@ -15601,7 +15592,6 @@ fi
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -24081,7 +24071,6 @@ echo "$as_me: error: Package requirements (\
libebook-1.2 >= $LIBEBOOK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED) were not met:
@@ -15629,7 +15619,6 @@ $as_echo "$as_me: error: Package requirements (\
cairo >= $CAIRO_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
- hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- hal >= $HAL_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED) were not met:

45
x11/gnome/cheese/patches/patch-src_cheese-webcam_c
View File

@ -1,11 +1,10 @@
$OpenBSD: patch-src_cheese-webcam_c,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp $
--- src/cheese-webcam.c.orig Sun Jun 29 18:17:43 2008
+++ src/cheese-webcam.c Mon Sep 8 12:23:55 2008
@@ -31,8 +31,20 @@
$OpenBSD: patch-src_cheese-webcam_c,v 1.2 2008/11/14 16:18:00 ajacoutot Exp $
--- src/cheese-webcam.c.orig Mon Oct 20 18:01:47 2008
+++ src/cheese-webcam.c Fri Nov 14 17:08:41 2008
@@ -32,13 +32,25 @@
#include <gst/gst.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
+
+#ifndef __OpenBSD__ // no HAL under OpenBSD
#include <libhal.h>
+#else
@ -18,22 +17,27 @@ $OpenBSD: patch-src_cheese-webcam_c,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp
+#endif
+#endif
+
#include "cheese-webcam.h"
/* for ioctl query */
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
+#ifdef __linux__
#include <linux/videodev.h>
+#endif
G_DEFINE_TYPE (CheeseWebcam, cheese_webcam, G_TYPE_OBJECT)
@@ -233,7 +245,7 @@ cheese_webcam_bus_message_cb (GstBus *bus, GstMessage
#include "cheese-webcam.h"
#include "cheese-flash.h"
@@ -244,6 +256,7 @@ cheese_webcam_bus_message_cb (GstBus *bus, GstMessage
}
}
-
+#ifndef __OpenBSD__ // no HAL under OpenBSD
static void
cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
{
@@ -307,7 +319,55 @@ cheese_webcam_get_video_devices_from_hal (CheeseWebcam
@@ -394,7 +407,55 @@ fallback:
priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
}
libhal_free_string_array (udis);
}
+#else // __OpenBSD__
+static void
@ -44,7 +48,7 @@ $OpenBSD: patch-src_cheese-webcam_c,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp
+ gchar videodev[] = "/dev/video?";
+ guint16 cammask = 0;
+ int i, ncams = 0, fd, ret, cur = 0;
+
+ for (i = 0; i < 9; i++)
+ {
+ videodev[strlen(videodev) - 1] = '0' + i;
@ -61,7 +65,7 @@ $OpenBSD: patch-src_cheese-webcam_c,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp
+ cammask |= (1 << i);
+ ++ncams;
+ }
+
+ priv->num_webcam_devices = ncams;
+ if (ncams == 0)
+ return;
@ -87,15 +91,16 @@ $OpenBSD: patch-src_cheese-webcam_c,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp
static void
cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure)
{
@@ -549,7 +609,11 @@ cheese_webcam_detect_webcam_devices (CheeseWebcam *web
CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
@@ -698,7 +759,11 @@ cheese_webcam_detect_webcam_devices (CheeseWebcam *web
int i;
- cheese_webcam_get_video_devices_from_hal (webcam);
+#ifndef __OpenBSD__ // no HAL under OpenBSD
cheese_webcam_get_video_devices_from_hal (webcam);
+ cheese_webcam_get_video_devices_from_hal (webcam);
+#else
+ cheese_webcam_get_video_devices_from_probe (webcam);
+#endif
for (i = 0; i < priv->num_webcam_devices; i++)
for (i = 0; i < priv->num_webcam_devices; i++)
{
cheese_webcam_get_webcam_device_data (&(priv->webcam_devices[i]));
cheese_webcam_get_webcam_device_data (webcam, &(priv->webcam_devices[i]));

65
x11/gnome/cheese/pkg/PLIST
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/09/22 13:50:29 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/11/14 16:18:00 ajacoutot Exp $
@bin bin/cheese
libexec/cheese/
libexec/cheese/cheese-bugreport.sh
share/applications/cheese.desktop
share/cheese/
share/cheese/cheese-prefs.ui
share/cheese/cheese-ui.xml
share/cheese/cheese.ui
share/cheese/effects/
@ -19,8 +20,32 @@ share/cheese/effects/vertigotv.png
share/cheese/effects/videoflip_h.png
share/cheese/effects/videoflip_v.png
share/cheese/effects/warptv.png
share/cheese/gtkrc
share/cheese/icons/
share/cheese/icons/hicolor/
share/cheese/icons/hicolor/16x16/
share/cheese/icons/hicolor/16x16/actions/
share/cheese/icons/hicolor/16x16/actions/browse-webcam-effects.png
share/cheese/icons/hicolor/22x22/
share/cheese/icons/hicolor/22x22/actions/
share/cheese/icons/hicolor/22x22/actions/browse-webcam-effects.png
share/cheese/icons/hicolor/24x24/
share/cheese/icons/hicolor/24x24/actions/
share/cheese/icons/hicolor/24x24/actions/browse-webcam-effects.png
share/cheese/icons/hicolor/32x32/
share/cheese/icons/hicolor/32x32/actions/
share/cheese/icons/hicolor/32x32/actions/browse-webcam-effects.png
share/cheese/icons/hicolor/48x48/
share/cheese/icons/hicolor/48x48/actions/
share/cheese/icons/hicolor/48x48/actions/browse-webcam-effects.png
share/cheese/icons/hicolor/scalable/
share/cheese/icons/hicolor/scalable/actions/
share/cheese/icons/hicolor/scalable/actions/browse-webcam-effects.svg
share/cheese/pixmaps/
share/cheese/pixmaps/camera-icon.svg
share/cheese/pixmaps/cheese-1.svg
share/cheese/pixmaps/cheese-2.svg
share/cheese/pixmaps/cheese-3.svg
share/cheese/pixmaps/thumbnail-frame.png
share/cheese/sounds/
share/cheese/sounds/shutter0.ogg
@ -28,6 +53,9 @@ share/cheese/sounds/shutter1.ogg
share/cheese/sounds/shutter2.ogg
share/cheese/sounds/shutter3.ogg
share/cheese/sounds/shutter4.ogg
share/dbus-1/
share/dbus-1/services/
share/dbus-1/services/org.gnome.Cheese.service
share/gnome/help/cheese/
share/gnome/help/cheese/C/
share/gnome/help/cheese/C/cheese.xml
@ -50,11 +78,21 @@ share/gnome/help/cheese/fr/cheese.xml
share/gnome/help/cheese/fr/figures/
share/gnome/help/cheese/fr/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/fr/figures/cheese-screenshot.jpg
share/gnome/help/cheese/nl/
share/gnome/help/cheese/nl/cheese.xml
share/gnome/help/cheese/nl/figures/
share/gnome/help/cheese/nl/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/nl/figures/cheese-screenshot.jpg
share/gnome/help/cheese/oc/
share/gnome/help/cheese/oc/cheese.xml
share/gnome/help/cheese/oc/figures/
share/gnome/help/cheese/oc/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/oc/figures/cheese-screenshot.jpg
share/gnome/help/cheese/pt_BR/
share/gnome/help/cheese/pt_BR/cheese.xml
share/gnome/help/cheese/pt_BR/figures/
share/gnome/help/cheese/pt_BR/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/pt_BR/figures/cheese-screenshot.jpg
share/gnome/help/cheese/ru/
share/gnome/help/cheese/ru/cheese.xml
share/gnome/help/cheese/ru/figures/
@ -65,6 +103,11 @@ share/gnome/help/cheese/sv/cheese.xml
share/gnome/help/cheese/sv/figures/
share/gnome/help/cheese/sv/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/sv/figures/cheese-screenshot.jpg
share/gnome/help/cheese/th/
share/gnome/help/cheese/th/cheese.xml
share/gnome/help/cheese/th/figures/
share/gnome/help/cheese/th/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/th/figures/cheese-screenshot.jpg
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/cheese.png
@ -93,6 +136,7 @@ share/locale/ca/LC_MESSAGES/cheese.mo
share/locale/cs/LC_MESSAGES/cheese.mo
share/locale/da/LC_MESSAGES/cheese.mo
share/locale/de/LC_MESSAGES/cheese.mo
share/locale/dz/LC_MESSAGES/cheese.mo
share/locale/el/LC_MESSAGES/cheese.mo
share/locale/en_GB/LC_MESSAGES/cheese.mo
share/locale/es/LC_MESSAGES/cheese.mo
@ -104,9 +148,12 @@ share/locale/ga/LC_MESSAGES/cheese.mo
share/locale/gl/LC_MESSAGES/cheese.mo
share/locale/gu/LC_MESSAGES/cheese.mo
share/locale/he/LC_MESSAGES/cheese.mo
share/locale/hi/LC_MESSAGES/cheese.mo
share/locale/hr/LC_MESSAGES/cheese.mo
share/locale/hu/LC_MESSAGES/cheese.mo
share/locale/it/LC_MESSAGES/cheese.mo
share/locale/ja/LC_MESSAGES/cheese.mo
share/locale/kn/LC_MESSAGES/cheese.mo
share/locale/ko/LC_MESSAGES/cheese.mo
share/locale/lt/LC_MESSAGES/cheese.mo
share/locale/mk/LC_MESSAGES/cheese.mo
@ -118,14 +165,27 @@ share/locale/nn/LC_MESSAGES/cheese.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/cheese.mo
share/locale/or/LC_MESSAGES/cheese.mo
share/locale/pa/LC_MESSAGES/cheese.mo
share/locale/pl/LC_MESSAGES/cheese.mo
share/locale/ps/
share/locale/ps/LC_MESSAGES/
share/locale/ps/LC_MESSAGES/cheese.mo
share/locale/pt/LC_MESSAGES/cheese.mo
share/locale/pt_BR/LC_MESSAGES/cheese.mo
share/locale/ro/LC_MESSAGES/cheese.mo
share/locale/ru/LC_MESSAGES/cheese.mo
share/locale/sl/LC_MESSAGES/cheese.mo
share/locale/sq/LC_MESSAGES/cheese.mo
share/locale/sr/LC_MESSAGES/cheese.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/cheese.mo
share/locale/sv/LC_MESSAGES/cheese.mo
share/locale/ta/LC_MESSAGES/cheese.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/cheese.mo
share/locale/th/LC_MESSAGES/cheese.mo
share/locale/tr/LC_MESSAGES/cheese.mo
share/locale/uk/LC_MESSAGES/cheese.mo
@ -138,9 +198,12 @@ share/omf/cheese/cheese-C.omf
share/omf/cheese/cheese-el.omf
share/omf/cheese/cheese-es.omf
share/omf/cheese/cheese-fr.omf
share/omf/cheese/cheese-nl.omf
share/omf/cheese/cheese-oc.omf
share/omf/cheese/cheese-pt_BR.omf
share/omf/cheese/cheese-ru.omf
share/omf/cheese/cheese-sv.omf
share/omf/cheese/cheese-th.omf
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/cheese/*.schemas > /dev/null
share/schemas/cheese/
share/schemas/cheese/cheese.schemas