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

import grilo 0.1.17

Browse Source 
Grilo is a framework focused on making media discovery and browsing easy
for application developers.
[...]

ok aja@

cvs: ----------------------------------------------------------------------
This commit is contained in:
jasper 2011-11-06 19:05:03 +00:00
parent 6184ef9000
commit a4d7eea071
8 changed files with 209 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
x11/gnome/grilo/Makefile Normal file
View File

@ -0,0 +1,42 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/11/06 19:05:03 jasper Exp $
COMMENT= framework for making media discovery and browsing easy
GNOME_PROJECT= grilo
GNOME_VERSION= 0.1.17
API= 0.1
SHARED_LIBS += grilo-0.1 0.0 # unknown
SHARED_LIBS += grlnet-0.1 0.0 # unknown
CATEGORIES+= multimedia
HOMEPAGE= http://live.gnome.org/Grilo
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= devel/gettext \
x11/gnome
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += cairo-gobject drm expat ffi fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs soup-2.4 stdc++
WANTLIB += xcb xcb-render xcb-shm xml2 z
LIB_DEPENDS= devel/libsoup \
x11/gtk+3
MODGNOME_TOOLS= goi vala
CONFIGURE_ARGS+=--enable-grl-net
SUBST_VARS+= API
.include <bsd.port.mk>

5
x11/gnome/grilo/distinfo Normal file
View File

@ -0,0 +1,5 @@
MD5 (gnome/grilo-0.1.17.tar.xz) = O+w/HP8ml7PsrEuz7Lk+IQ==
RMD160 (gnome/grilo-0.1.17.tar.xz) = q6OkvzC39mQPo63cUV1SqYX92Pk=
SHA1 (gnome/grilo-0.1.17.tar.xz) = HcVb3uTsZjez523p+2ZhWr4U3VQ=
SHA256 (gnome/grilo-0.1.17.tar.xz) = +IQGsXN73w3DjDrNpBiYMISv5i3cCf79FKlfQuxyfq8=
SIZE (gnome/grilo-0.1.17.tar.xz) = 492740

64
x11/gnome/grilo/patches/patch-libs_net_grl-net-wc_c Normal file
View File

@ -0,0 +1,64 @@
$OpenBSD: patch-libs_net_grl-net-wc_c,v 1.1.1.1 2011/11/06 19:05:03 jasper Exp $
From 7abc1ac9b84a84fa5f1c2c0f4e9342b21f48afe0 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Wed, 26 Oct 2011 11:36:41 +0000
Subject: grl-net: Fix crashes in SoupRequest error case
--- libs/net/grl-net-wc.c.orig Mon Sep 5 12:59:20 2011
+++ libs/net/grl-net-wc.c Wed Nov 2 21:25:20 2011
@@ -420,8 +420,20 @@ reply_cb (GObject *source, GAsyncResult *res, gpointer
{
GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data);
RequestResult *rr = g_simple_async_result_get_op_res_gpointer (result);
+ GError *error = NULL;
- GInputStream *in = soup_request_send_finish (rr->request, res, NULL);
+ GInputStream *in = soup_request_send_finish (rr->request, res, &error);
+
+ if (error != NULL) {
+ g_simple_async_result_set_error (result, GRL_NET_WC_ERROR,
+ GRL_NET_WC_ERROR_UNAVAILABLE,
+ "Data not available");
+ g_error_free (error);
+
+ g_simple_async_result_complete (result);
+ return;
+ }
+
rr->length = soup_request_get_content_length (rr->request) + 1;
if (rr->length == 1) {
rr->length = BUFFER_SIZE;
@@ -481,10 +493,12 @@ get_url_now (GrlNetWc *self,
{
RequestResult *rr = g_slice_new0 (RequestResult);
- rr->request = soup_requester_request (self->priv->requester, url, NULL);
g_simple_async_result_set_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result),
rr,
NULL);
+
+ rr->request = soup_requester_request (self->priv->requester, url, NULL);
+
soup_request_send_async (rr->request, cancellable, reply_cb, result);
}
@@ -706,14 +720,16 @@ grl_net_wc_request_finish (GrlNetWc *self,
g_warn_if_fail (g_simple_async_result_get_source_tag (res) ==
grl_net_wc_request_async);
+#ifdef LIBSOUP_USE_UNSTABLE_REQUEST_API
+ RequestResult *rr = g_simple_async_result_get_op_res_gpointer (res);
+#endif
+
if (g_simple_async_result_propagate_error (res, error) == TRUE) {
ret = FALSE;
goto end_func;
}
#ifdef LIBSOUP_USE_UNSTABLE_REQUEST_API
- RequestResult *rr = g_simple_async_result_get_op_res_gpointer (res);
-
if (self->priv->previous_data) {
g_free (self->priv->previous_data);
}

17
x11/gnome/grilo/patches/patch-tools_grilo-inspect_Makefile_in Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-tools_grilo-inspect_Makefile_in,v 1.1.1.1 2011/11/06 19:05:03 jasper Exp $
From 651197c685cd0a40c2b98fb5c6d038563cb783de Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Mon, 05 Sep 2011 11:44:28 +0000
Subject: tools: Don't link against -ldl and -lpthread
--- tools/grilo-inspect/Makefile.in.orig Wed Nov 2 21:24:07 2011
+++ tools/grilo-inspect/Makefile.in Wed Nov 2 21:24:11 2011
@@ -262,7 +262,6 @@ grl_inspect_CFLAGS = \
-I$(top_srcdir)/src/data
grl_inspect_LDADD = \
- -ldl -lpthread \
$(DEPS_LIBS) \
$(GTK_LIBS) \
$(top_builddir)/src/lib@GRL_NAME@.la

17
x11/gnome/grilo/patches/patch-tools_grilo-test-ui_Makefile_in Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-tools_grilo-test-ui_Makefile_in,v 1.1.1.1 2011/11/06 19:05:03 jasper Exp $
From 651197c685cd0a40c2b98fb5c6d038563cb783de Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Mon, 05 Sep 2011 11:44:28 +0000
Subject: tools: Don't link against -ldl and -lpthread
--- tools/grilo-test-ui/Makefile.in.orig Wed Nov 2 21:23:51 2011
+++ tools/grilo-test-ui/Makefile.in Wed Nov 2 21:23:58 2011
@@ -267,7 +267,6 @@ grilo_test_ui_CFLAGS = \
-I$(top_srcdir)/src/data
grilo_test_ui_LDADD = \
- -ldl -lpthread \
$(DEPS_LIBS) \
$(GTU_LIBS) \
$(GRL_FLICKR_LIBS) \

13
x11/gnome/grilo/pkg/DESCR Normal file
View File

@ -0,0 +1,13 @@
Grilo is a framework focused on making media discovery and browsing easy
for application developers.
More precisely, Grilo provides:
- A single, high-level API that abstracts the differences among various
media content providers, allowing application developers to integrate
content from various services and sources easily.
- A collection of plugins for accessing content from various media
providers. Developers can share efforts and code by writing plugins for
the framework that are application agnostic.
- A flexible API that allows plugin developers to write plugins of
various kinds.

3
x11/gnome/grilo/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/11/06 19:05:03 jasper Exp $
@lib lib/libgrilo-${API}.so.${LIBgrilo-0.1_VERSION}
@lib lib/libgrlnet-${API}.so.${LIBgrlnet-0.1_VERSION}

48
x11/gnome/grilo/pkg/PLIST Normal file
View File

@ -0,0 +1,48 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/11/06 19:05:03 jasper Exp $
%%SHARED%%
@bin bin/grilo-simple-playlist
@bin bin/grilo-test-ui
@bin bin/grl-inspect
include/grilo-${API}/
include/grilo-${API}/grilo.h
include/grilo-${API}/grl-config.h
include/grilo-${API}/grl-data.h
include/grilo-${API}/grl-definitions.h
include/grilo-${API}/grl-error.h
include/grilo-${API}/grl-log.h
include/grilo-${API}/grl-media-audio.h
include/grilo-${API}/grl-media-box.h
include/grilo-${API}/grl-media-image.h
include/grilo-${API}/grl-media-plugin.h
include/grilo-${API}/grl-media-source.h
include/grilo-${API}/grl-media-video.h
include/grilo-${API}/grl-media.h
include/grilo-${API}/grl-metadata-key.h
include/grilo-${API}/grl-metadata-source.h
include/grilo-${API}/grl-multiple.h
include/grilo-${API}/grl-operation.h
include/grilo-${API}/grl-plugin-registry.h
include/grilo-${API}/grl-related-keys.h
include/grilo-${API}/grl-util.h
include/grilo-${API}/net/
include/grilo-${API}/net/grl-net-wc.h
include/grilo-${API}/net/grl-net.h
lib/girepository-1.0/
lib/girepository-1.0/Grl-${API}.typelib
lib/girepository-1.0/GrlNet-${API}.typelib
lib/libgrilo-${API}.a
lib/libgrilo-${API}.la
lib/libgrlnet-${API}.a
lib/libgrlnet-${API}.la
lib/pkgconfig/
lib/pkgconfig/grilo-${API}.pc
lib/pkgconfig/grilo-net-${API}.pc
share/gir-1.0/
share/gir-1.0/Grl-${API}.gir
share/gir-1.0/GrlNet-${API}.gir
share/vala-${API}4/
share/vala-${API}4/vapi/
share/vala-${API}4/vapi/grilo-${API}.deps
share/vala-${API}4/vapi/grilo-${API}.vapi
share/vala-${API}4/vapi/grilo-net-${API}.deps
share/vala-${API}4/vapi/grilo-net-${API}.vapi