Fix by Jan Vansteenkiste for building with newer versions of libass #285328 by Dirk Best.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 259 insertions, 7 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 71e6ac790d43..273c6ce04dc9 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.27 2009/09/26 11:45:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.28 2009/09/26 12:13:00 vapier Exp $
+
+  26 Sep 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  +files/xbmc-9999-libass.patch:
+  Fix by Jan Vansteenkiste for building with newer versions of libass
+  #285328 by Dirk Best.
 
   26 Sep 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9.04.ebuild,
   xbmc-9.04.1.ebuild, xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 928dc5d72633..23f3313feaff 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX xbmc-9.04-gcc.patch 2966 RMD160 cada277b78b85c8ddf6b539c3e8941b41c82ef35 SHA1 ff3eef31033a23385607c78436094958ab71457d SHA256 b7cf032b4208013a8935429c84c7597e4ec8be01599da0cfbf923ef4124305c5
+AUX xbmc-9999-libass.patch 13812 RMD160 e9f93ae0a71904a3740993de3fa6bd63cf67b02d SHA1 f5a9c9549380cd839437cb189284cd6b6b4dc536 SHA256 591bb3019031c743788c69380f0f3cb875dc9f44fd01eb74dfc8d04eb3378f33
 DIST 9.04.1_Babylon-linux-osx-win32-repack.tar.gz 171093731 RMD160 143f42f6eef827aad5d345610575c5e754d9222c SHA1 8d85d0e16861827ce535c1acd4b149099d7782c7 SHA256 2e2da9fd887ee578cac4896e1ae383007de67e27675bb030c361ea16bdb1ec98
 DIST XBMC_9.04_Babylon-linux-osx-win32.tar.bz2 111993901 RMD160 7b108c0d22ca31895008d056e3f681e3c98386e2 SHA1 097db32fa4ae4ced0c8d101195d040a81a6ca105 SHA256 2a477b51578e345112859ea06d20abea03a7e6d079ac4012670b1b1b82b3faed
 EBUILD xbmc-9.04.1.ebuild 3647 RMD160 2032e33b5445797fd2c3eb5bead9ac5129449b9d SHA1 22e90400103e21030a94918d52472d9d8f9db864 SHA256 4ea25a3ea6d5f8335266d6d6740d0ba1f91902403e505244c246ac5f950438bf
 EBUILD xbmc-9.04.ebuild 3511 RMD160 f295863fe5fbbd6eda9e1f291eb67caeb0cd8ae2 SHA1 e4a4dfb232ec4991c8e3e06660ae7739fcff8d90 SHA256 e2b095c1e303bb669f934fccd3cb69bbde3deeff8eec7908b933774bfe9207c4
-EBUILD xbmc-9999.ebuild 3654 RMD160 a14af86097b344e4ce149e8dd96523049ef2dca7 SHA1 b4f2baf3ffccb6a42d13d8d5cbd26072377e74c1 SHA256 5b74b1b17b6c23ff005bd1d9b87443f5cbedca7cc3c9816139bb97d51a6bce91
-MISC ChangeLog 4296 RMD160 f43cb51e4a810b5cc7a4ff38c8bb77a14db6f76b SHA1 88fd78a09ea42bd2213e547d80bcf1c4b0a90cf0 SHA256 d7b2c3ddc97a7f78cd656447334c97fb12122ac5c431583ba0f177ab676feb33
+EBUILD xbmc-9999.ebuild 3703 RMD160 2afd3bfda0d3dbc0a21be99817cb893d82610431 SHA1 abe047f0102817591f7d6468c1cfede07439e6f8 SHA256 c5a680a655f2a0dd05b7eefc9b25af7738208fb28f902adfdd980b7cdfbb4a54
+MISC ChangeLog 4492 RMD160 63b208180522e2add4fc91132183e94d903f856e SHA1 876d639a87d757b3b74b17f0eb7991a5ab271b08 SHA256 b0f087acb90c4791515e9fc3708a61e4a3d2eafebd33507b10dc612da6b5d523
 MISC metadata.xml 259 RMD160 1451e37fea39b948f3e6f0c0eb20c8d9e41801f0 SHA1 73240b8832bc707628304061d6980bdf7d6baa28 SHA256 31764ed43ab7fbf241987d089733cd337e410b53f3135ff020a13ed24793af64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq+BQIACgkQlPl3HsVfCDrM6ACcCvrRqdmOe1+6PhGlkAsORuS1
-ZwEAn3m2IcOAvIslQoqnL13omecroPOE
-=eSX/
+iEYEARECAAYFAkq+BVIACgkQlPl3HsVfCDo9qACfRtn93pm+lbSf9UMSsVosesW0
+cJgAnirTNaD+Lrp1Osq3bZ3b2eGP1G+5
+=7LWo
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-9999-libass.patch b/media-tv/xbmc/files/xbmc-9999-libass.patch
new file mode 100644
index 000000000000..0dec3452d743
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9999-libass.patch
@@ -0,0 +1,244 @@
+https://bugs.gentoo.org/285328
+http://xbmc.org/trac/ticket/7103
+
+--- xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
++++ xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
+@@ -340,8 +340,8 @@
+   m_x      = (float)0.0f;
+   m_y      = (float)0.0f;
+ 
+-  ass_image_t* images = o->m_libass->RenderImage((int)m_width, (int)m_height, pts);
+-  ass_image_t* img;
++  ASS_Image* images = o->m_libass->RenderImage((int)m_width, (int)m_height, pts);
++  ASS_Image* img;
+ 
+   m_texture = ~(GLuint)0;
+ 
+--- xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
++++ xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
+@@ -71,7 +71,7 @@
+   height = pPicture->height;
+   width = pPicture->width;
+ 
+-  ass_image_t* img = pOverlay->m_libass->RenderImage(width, height, pts);
++  ASS_Image* img = pOverlay->m_libass->RenderImage(width, height, pts);
+ 
+   while(img)
+   {
+--- xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
++++ xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
+@@ -166,7 +166,7 @@
+   return m_references;
+ }
+ 
+-ass_image_t* CDVDSubtitlesLibass::RenderImage(int imageWidth, int imageHeight, double pts)
++ASS_Image* CDVDSubtitlesLibass::RenderImage(int imageWidth, int imageHeight, double pts)
+ {
+   if(!m_renderer || !m_track)
+   {
+@@ -178,7 +178,7 @@
+   return m_dll.ass_render_frame(m_renderer, m_track, DVD_TIME_TO_MSEC(pts), NULL);
+ }
+ 
+-ass_event_t* CDVDSubtitlesLibass::GetEvents()
++ASS_Event* CDVDSubtitlesLibass::GetEvents()
+ {
+   if(!m_track)
+   {
+--- xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
++++ xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
+@@ -44,12 +44,12 @@
+     return false;
+ 
+   //Creating the overlays by going through the list of ass_events
+-  ass_event_t* assEvent = m_libass->GetEvents();
++  ASS_Event* assEvent = m_libass->GetEvents();
+   int numEvents = m_libass->GetNrOfEvents();
+ 
+   for(int i=0; i < numEvents; i++)
+   {
+-    ass_event_t* curEvent =  (assEvent+i);
++    ASS_Event* curEvent =  (assEvent+i);
+     if (curEvent)
+     {
+       CDVDOverlaySSA* overlay = new CDVDOverlaySSA(m_libass);
+--- xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
++++ xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
+@@ -38,25 +38,25 @@
+ {
+ public:
+   virtual ~DllLibassInterface() {}
+-  virtual void ass_set_extract_fonts(ass_library_t* priv, int extract)=0;
+-  virtual void ass_set_fonts_dir(ass_library_t* priv, const char* fonts_dir)=0;
+-  virtual ass_library_t* ass_library_init(void)=0;
+-  virtual ass_renderer_t* ass_renderer_init(ass_library_t* library)=0;
+-  virtual void ass_set_frame_size(ass_renderer_t* priv, int w, int h)=0;
+-  virtual void ass_set_margins(ass_renderer_t* priv, int t, int b, int l, int r)=0;
+-  virtual void ass_set_use_margins(ass_renderer_t* priv, int use)=0;
+-  virtual void ass_set_font_scale(ass_renderer_t* priv, double font_scale)=0;
+-  virtual ass_image_t* ass_render_frame(ass_renderer_t *priv, ass_track_t* track, long long now, int* detect_change)=0;
+-  virtual ass_track_t* ass_new_track(ass_library_t*)=0;
+-  virtual ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage)=0;
+-  virtual void ass_free_track(ass_track_t* track)=0;
+-  virtual void ass_set_fonts(ass_renderer_t *priv, const char *default_font, const char *default_family, int fc, const char *config, int update) = 0;
+-  virtual void ass_set_style_overrides(ass_library_t* priv, char** list)=0;
+-  virtual void ass_library_done(ass_library_t* library)=0;
+-  virtual void ass_renderer_done(ass_renderer_t* renderer)=0;
+-  virtual void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration)=0;
+-  virtual void ass_process_codec_private(ass_track_t* track, char *data, int size)=0;
+-  virtual void ass_set_message_cb(ass_library_t *priv
++  virtual void ass_set_extract_fonts(ASS_Library* priv, int extract)=0;
++  virtual void ass_set_fonts_dir(ASS_Library* priv, const char* fonts_dir)=0;
++  virtual ASS_Library* ass_library_init(void)=0;
++  virtual ASS_Renderer* ass_renderer_init(ASS_Library* library)=0;
++  virtual void ass_set_frame_size(ASS_Renderer* priv, int w, int h)=0;
++  virtual void ass_set_margins(ASS_Renderer* priv, int t, int b, int l, int r)=0;
++  virtual void ass_set_use_margins(ASS_Renderer* priv, int use)=0;
++  virtual void ass_set_font_scale(ASS_Renderer* priv, double font_scale)=0;
++  virtual ASS_Image* ass_render_frame(ASS_Renderer *priv, ASS_Track* track, long long now, int* detect_change)=0;
++  virtual ASS_Track* ass_new_track(ASS_Library*)=0;
++  virtual ASS_Track* ass_read_file(ASS_Library* library, char* fname, char* codepage)=0;
++  virtual void ass_free_track(ASS_Track* track)=0;
++  virtual void ass_set_fonts(ASS_Renderer *priv, const char *default_font, const char *default_family, int fc, const char *config, int update) = 0;
++  virtual void ass_set_style_overrides(ASS_Library* priv, char** list)=0;
++  virtual void ass_library_done(ASS_Library* library)=0;
++  virtual void ass_renderer_done(ASS_Renderer* renderer)=0;
++  virtual void ass_process_chunk(ASS_Track* track, char *data, int size, long long timecode, long long duration)=0;
++  virtual void ass_process_codec_private(ASS_Track* track, char *data, int size)=0;
++  virtual void ass_set_message_cb(ASS_Library *priv
+                                 , void (*msg_cb)(int level, const char *fmt, va_list args, void *data)
+                                 , void *data)=0;
+ };
+@@ -67,43 +67,43 @@
+ {
+ public:
+     virtual ~DllLibass() {}
+-    virtual void ass_set_extract_fonts(ass_library_t* priv, int extract)
++    virtual void ass_set_extract_fonts(ASS_Library* priv, int extract)
+         { return ::ass_set_extract_fonts(priv, extract); }
+-    virtual void ass_set_fonts_dir(ass_library_t* priv, const char* fonts_dir)
++    virtual void ass_set_fonts_dir(ASS_Library* priv, const char* fonts_dir)
+         { return ::ass_set_fonts_dir(priv, fonts_dir); }
+-    virtual ass_library_t* ass_library_init(void)
++    virtual ASS_Library* ass_library_init(void)
+         { return ::ass_library_init(); }
+-    virtual ass_renderer_t* ass_renderer_init(ass_library_t* library)
++    virtual ASS_Renderer* ass_renderer_init(ASS_Library* library)
+         { return ::ass_renderer_init(library); }
+-    virtual void ass_set_frame_size(ass_renderer_t* priv, int w, int h)
++    virtual void ass_set_frame_size(ASS_Renderer* priv, int w, int h)
+         { return ::ass_set_frame_size(priv, w, h); }
+-    virtual void ass_set_margins(ass_renderer_t* priv, int t, int b, int l, int r)
++    virtual void ass_set_margins(ASS_Renderer* priv, int t, int b, int l, int r)
+         { return ::ass_set_margins(priv, t, b, l, r); }
+-    virtual void ass_set_use_margins(ass_renderer_t* priv, int use)
++    virtual void ass_set_use_margins(ASS_Renderer* priv, int use)
+         { return ::ass_set_use_margins(priv, use); }
+-    virtual void ass_set_font_scale(ass_renderer_t* priv, double font_scale)
++    virtual void ass_set_font_scale(ASS_Renderer* priv, double font_scale)
+         { return ::ass_set_font_scale(priv, font_scale); }
+-    virtual ass_image_t* ass_render_frame(ass_renderer_t *priv, ass_track_t* track, long long now, int* detect_change)
++    virtual ASS_Image* ass_render_frame(ASS_Renderer *priv, ASS_Track* track, long long now, int* detect_change)
+         { return ::ass_render_frame(priv, track, now, detect_change); }
+-    virtual ass_track_t* ass_new_track(ass_library_t* library)
++    virtual ASS_Track* ass_new_track(ASS_Library* library)
+         { return ::ass_new_track(library); }
+-    virtual ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage)
++    virtual ASS_Track* ass_read_file(ASS_Library* library, char* fname, char* codepage)
+         { return ::ass_read_file(library, fname, codepage); }
+-    virtual void ass_free_track(ass_track_t* track)
++    virtual void ass_free_track(ASS_Track* track)
+         { return ::ass_free_track(track); }
+-    virtual void ass_set_fonts(ass_renderer_t *priv, const char *default_font, const char *default_family, int fc, const char *config, int update)
++    virtual void ass_set_fonts(ASS_Renderer *priv, const char *default_font, const char *default_family, int fc, const char *config, int update)
+         { return ::ass_set_fonts(priv, default_font, default_family, fc, config, update); }
+-    virtual void ass_set_style_overrides(ass_library_t* priv, char** list)
++    virtual void ass_set_style_overrides(ASS_Library* priv, char** list)
+         { return ::ass_set_style_overrides(priv, list); }
+-    virtual void ass_library_done(ass_library_t* library)
++    virtual void ass_library_done(ASS_Library* library)
+         { return ::ass_library_done(library); }
+-    virtual void ass_renderer_done(ass_renderer_t* renderer)
++    virtual void ass_renderer_done(ASS_Renderer* renderer)
+         { return ::ass_renderer_done(renderer); }
+-    virtual void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration)
++    virtual void ass_process_chunk(ASS_Track* track, char *data, int size, long long timecode, long long duration)
+         { return ::ass_process_chunk(track, data, size, timecode, duration); }
+-    virtual void ass_process_codec_private(ass_track_t* track, char *data, int size)
++    virtual void ass_process_codec_private(ASS_Track* track, char *data, int size)
+         { return ::ass_process_codec_private(track, data, size); }
+-    virtual void ass_set_message_cb(ass_library_t *priv
++    virtual void ass_set_message_cb(ASS_Library *priv
+                                    , void (*msg_cb)(int level, const char *fmt, va_list args, void *data)
+                                    , void *data)
+         { return ::ass_set_message_cb(priv, msg_cb, data); }
+@@ -122,25 +122,25 @@
+ class DllLibass : public DllDynamic, DllLibassInterface
+ {
+   DECLARE_DLL_WRAPPER(DllLibass, DLL_PATH_LIBASS)
+-  DEFINE_METHOD2(void, ass_set_extract_fonts, (ass_library_t * p1, int p2))
+-  DEFINE_METHOD2(void, ass_set_fonts_dir, (ass_library_t * p1, const char * p2))
+-  DEFINE_METHOD0(ass_library_t *, ass_library_init)
+-  DEFINE_METHOD1(ass_renderer_t *, ass_renderer_init, (ass_library_t * p1))
+-  DEFINE_METHOD3(void, ass_set_frame_size, (ass_renderer_t * p1, int p2, int p3))
+-  DEFINE_METHOD5(void, ass_set_margins, (ass_renderer_t * p1, int p2, int p3, int p4, int p5))
+-  DEFINE_METHOD2(void, ass_set_use_margins, (ass_renderer_t * p1, int p2))
+-  DEFINE_METHOD2(void, ass_set_font_scale, (ass_renderer_t * p1, double p2))
+-  DEFINE_METHOD4(ass_image_t *, ass_render_frame, (ass_renderer_t * p1, ass_track_t * p2, long long p3, int * p4))
+-  DEFINE_METHOD1(ass_track_t *, ass_new_track, (ass_library_t * p1))
+-  DEFINE_METHOD3(ass_track_t *, ass_read_file, (ass_library_t * p1, char * p2, char * p3))
+-  DEFINE_METHOD1(void, ass_free_track, (ass_track_t * p1))
+-  DEFINE_METHOD6(void, ass_set_fonts, (ass_renderer_t* p1, const char* p2, const char* p3, int p4, const char* p5, int p6))
+-  DEFINE_METHOD2(void, ass_set_style_overrides, (ass_library_t* p1, char** p2))
+-  DEFINE_METHOD1(void, ass_library_done, (ass_library_t* p1))
+-  DEFINE_METHOD1(void, ass_renderer_done, (ass_renderer_t* p1))
+-  DEFINE_METHOD5(void, ass_process_chunk, (ass_track_t* p1, char* p2, int p3, long long p4, long long p5))
+-  DEFINE_METHOD3(void, ass_process_codec_private, (ass_track_t* p1, char* p2, int p3))
+-  DEFINE_METHOD3(void, ass_set_message_cb, (ass_library_t* p1, void (*p2)(int level, const char *fmt, va_list args, void *data), void* p3))
++  DEFINE_METHOD2(void, ass_set_extract_fonts, (ASS_Library * p1, int p2))
++  DEFINE_METHOD2(void, ass_set_fonts_dir, (ASS_Library * p1, const char * p2))
++  DEFINE_METHOD0(ASS_Library *, ass_library_init)
++  DEFINE_METHOD1(ASS_Renderer *, ass_renderer_init, (ASS_Library * p1))
++  DEFINE_METHOD3(void, ass_set_frame_size, (ASS_Renderer * p1, int p2, int p3))
++  DEFINE_METHOD5(void, ass_set_margins, (ASS_Renderer * p1, int p2, int p3, int p4, int p5))
++  DEFINE_METHOD2(void, ass_set_use_margins, (ASS_Renderer * p1, int p2))
++  DEFINE_METHOD2(void, ass_set_font_scale, (ASS_Renderer * p1, double p2))
++  DEFINE_METHOD4(ASS_Image *, ass_render_frame, (ASS_Renderer * p1, ASS_Track * p2, long long p3, int * p4))
++  DEFINE_METHOD1(ASS_Track *, ass_new_track, (ASS_Library * p1))
++  DEFINE_METHOD3(ASS_Track *, ass_read_file, (ASS_Library * p1, char * p2, char * p3))
++  DEFINE_METHOD1(void, ass_free_track, (ASS_Track * p1))
++  DEFINE_METHOD6(void, ass_set_fonts, (ASS_Renderer* p1, const char* p2, const char* p3, int p4, const char* p5, int p6))
++  DEFINE_METHOD2(void, ass_set_style_overrides, (ASS_Library* p1, char** p2))
++  DEFINE_METHOD1(void, ass_library_done, (ASS_Library* p1))
++  DEFINE_METHOD1(void, ass_renderer_done, (ASS_Renderer* p1))
++  DEFINE_METHOD5(void, ass_process_chunk, (ASS_Track* p1, char* p2, int p3, long long p4, long long p5))
++  DEFINE_METHOD3(void, ass_process_codec_private, (ASS_Track* p1, char* p2, int p3))
++  DEFINE_METHOD3(void, ass_set_message_cb, (ASS_Library* p1, void (*p2)(int level, const char *fmt, va_list args, void *data), void* p3))
+   BEGIN_METHOD_RESOLVE()
+     RESOLVE_METHOD(ass_set_extract_fonts)
+     RESOLVE_METHOD(ass_set_fonts_dir)
+--- xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h
++++ xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h
+@@ -31,8 +31,8 @@
+   CDVDSubtitlesLibass();
+   ~CDVDSubtitlesLibass();
+ 
+-  ass_image_t* RenderImage(int imageWidth, int imageHeight, double pts);
+-  ass_event_t* GetEvents();
++  ASS_Image* RenderImage(int imageWidth, int imageHeight, double pts);
++  ASS_Event* GetEvents();
+ 
+   int GetNrOfEvents();
+ 
+@@ -47,8 +47,8 @@
+ private:
+   DllLibass m_dll;
+   long m_references;
+-  ass_library_t* m_library;
+-  ass_track_t* m_track;
+-  ass_renderer_t* m_renderer;
++  ASS_Library* m_library;
++  ASS_Track* m_track;
++  ASS_Renderer* m_renderer;
+ };
+ 
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 170e1ddaf206..a1d3bd7f13da 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.32 2009/09/26 12:11:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.33 2009/09/26 12:13:00 vapier Exp $
 
 # XXX: be nice to split out packages that come bundled and use the
 #      system libraries ...
@@ -98,6 +98,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libass.patch #285328
+
 	# Tweak autotool timestamps to avoid regeneration
 	find . -type f -print0 | xargs -0 touch -r configure