The attached patch fixes build for emotion with libxine 1.2.x.
I only forward this for nox, who is not subscribed (and seems to have
trouble getting in the moderation queue).
All credits to him.


---------- Forwarded message ----------
From: Juergen Lock <n...@jelal.kn-bremen.de>
Date: Sat, Mar 3, 2012 at 01:47
Subject: [nox: [PATCH] build fix for emotion with libxine 1.2.x]
To: tho...@gstaedtner.net


----- Forwarded message from nox -----

Date: Tue, 28 Feb 2012 20:53:01 +0100
To: enlightenment-devel@lists.sourceforge.net
Subject: [PATCH] build fix for emotion with libxine 1.2.x
User-Agent: Mutt/1.5.21 (2010-09-15)

Patch also here:

       
http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/emotion/files/patch-src-modules-xine-emotion_xine_vo_out.c

--- src/modules/xine/emotion_xine_vo_out.c.orig
+++ src/modules/xine/emotion_xine_vo_out.c
@@ -119,8 +119,13 @@ _emotion_class_init(xine_t *xine, void *
   cl = (Emotion_Class *) malloc(sizeof(Emotion_Class));
   if (!cl) return NULL;
   cl->driver_class.open_plugin     = _emotion_open;
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 &&
XINE_MINOR_VERSION < 2)
   cl->driver_class.get_identifier  = _emotion_class_identifier_get;
   cl->driver_class.get_description = _emotion_class_description_get;
+#else
+   cl->driver_class.identifier      = _emotion_class_identifier_get(NULL);
+   cl->driver_class.description     = _emotion_class_description_get(NULL);
+#endif
   cl->driver_class.dispose         = _emotion_class_dispose;
   cl->config                       = xine->config;
   cl->xine                         = xine;

----- End forwarded message -----
--- src/modules/xine/emotion_xine_vo_out.c.orig
+++ src/modules/xine/emotion_xine_vo_out.c
@@ -119,8 +119,13 @@ _emotion_class_init(xine_t *xine, void *
    cl = (Emotion_Class *) malloc(sizeof(Emotion_Class));
    if (!cl) return NULL;
    cl->driver_class.open_plugin     = _emotion_open;
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) 
    cl->driver_class.get_identifier  = _emotion_class_identifier_get;
    cl->driver_class.get_description = _emotion_class_description_get;
+#else
+   cl->driver_class.identifier      = _emotion_class_identifier_get(NULL);
+   cl->driver_class.description     = _emotion_class_description_get(NULL);
+#endif
    cl->driver_class.dispose         = _emotion_class_dispose;
    cl->config                       = xine->config;
    cl->xine                         = xine;
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to