[pkgsrc/trunk]: pkgsrc/multimedia/vlc07 Made the package build with gcc4.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10393af749c8
branches:  trunk
changeset: 536051:10393af749c8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Dec 01 21:33:24 2007 +0000

description:
Made the package build with gcc4.

diffstat:

 multimedia/vlc07/distinfo         |   5 +++-
 multimedia/vlc07/patches/patch-aj |  17 ++++++++++++++++
 multimedia/vlc07/patches/patch-ak |  40 ++++++++++++++++++++++++++++++++++++++
 multimedia/vlc07/patches/patch-al |  41 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+), 1 deletions(-)

diffs (126 lines):

diff -r 9d0ad3d77d57 -r 10393af749c8 multimedia/vlc07/distinfo
--- a/multimedia/vlc07/distinfo Sat Dec 01 21:29:52 2007 +0000
+++ b/multimedia/vlc07/distinfo Sat Dec 01 21:33:24 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/09/29 19:44:05 drochner Exp $
+$NetBSD: distinfo,v 1.5 2007/12/01 21:33:24 rillig Exp $
 
 SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21
 RMD160 (vlc-0.7.2.tar.bz2) = 05e35e0b9080581cfbc730212fc756cb46bd3257
@@ -12,3 +12,6 @@
 SHA1 (patch-ag) = e71070ddfd8a06978d092e2e103308a52e101e13
 SHA1 (patch-ah) = 810c1341241d4fb800810c70c5eeb5ae5b5eb2dc
 SHA1 (patch-ai) = f512852628a5e6922c7a431c089b1797625968ca
+SHA1 (patch-aj) = bcaf045d04babd53c46ba0c79eac8157862c78f4
+SHA1 (patch-ak) = bf1da0494dd49db8a2b4814bce0dd16fcfad5896
+SHA1 (patch-al) = 8f6f1f9d8b6e3adf6b89021c392276e83af8bb1e
diff -r 9d0ad3d77d57 -r 10393af749c8 multimedia/vlc07/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc07/patches/patch-aj Sat Dec 01 21:33:24 2007 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aj,v 1.1 2007/12/01 21:33:25 rillig Exp $
+
+--- modules/gui/wxwindows/menus.cpp.orig       2004-05-21 10:48:52.000000000 +0000
++++ modules/gui/wxwindows/menus.cpp    2007-12-01 14:18:28.000000000 +0000
+@@ -65,9 +65,9 @@ public:
+     void Clear();
+ 
+ private:
+-    wxMenu *Menu::CreateDummyMenu();
+-    void   Menu::CreateMenuItem( wxMenu *, char *, vlc_object_t * );
+-    wxMenu *Menu::CreateChoicesMenu( char *, vlc_object_t *, bool );
++    wxMenu *CreateDummyMenu();
++    void   CreateMenuItem( wxMenu *, char *, vlc_object_t * );
++    wxMenu *CreateChoicesMenu( char *, vlc_object_t *, bool );
+ 
+     DECLARE_EVENT_TABLE();
+ 
diff -r 9d0ad3d77d57 -r 10393af749c8 multimedia/vlc07/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc07/patches/patch-ak Sat Dec 01 21:33:24 2007 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.1 2007/12/01 21:33:25 rillig Exp $
+
+--- modules/gui/wxwindows/wizard.cpp.orig      2004-04-30 15:41:16.000000000 +0000
++++ modules/gui/wxwindows/wizard.cpp   2007-12-01 14:15:44.000000000 +0000
+@@ -306,7 +306,7 @@ class wizInputPage : public wxWizardPage
+ {
+     public:
+         wizInputPage( wxWizard *, wxWizardPage *, intf_thread_t *);
+-        wizInputPage::~wizInputPage();
++        ~wizInputPage();
+         void OnWizardPageChanging(wxWizardEvent& event);
+         void OnInputChange(wxEvent& event);
+         void OnEnablePartial(wxCommandEvent& event);
+@@ -355,7 +355,7 @@ class wizTranscodeCodecPage : public wxW
+ public:
+     wizTranscodeCodecPage( wxWizard *parent, wxWizardPage *next);
+     ~wizTranscodeCodecPage();
+-    void wizTranscodeCodecPage::OnWizardPageChanging(wxWizardEvent& event);
++    void OnWizardPageChanging(wxWizardEvent& event);
+     virtual wxWizardPage *GetPrev() const;
+     virtual wxWizardPage *GetNext() const;
+     void SetPrev( wxWizardPage *page);
+@@ -428,7 +428,7 @@ class wizEncapPage : public wxWizardPage
+ {
+ public:
+     wizEncapPage( wxWizard *parent);
+-    wizEncapPage::~wizEncapPage();
++    ~wizEncapPage();
+     void OnWizardPageChanging(wxWizardEvent& event);
+     virtual wxWizardPage *GetPrev() const;
+     virtual wxWizardPage *GetNext() const;
+@@ -474,7 +474,7 @@ public:
+     virtual wxWizardPage *GetNext() const;
+ protected:
+     DECLARE_EVENT_TABLE()
+-    void wizTranscodeExtraPage::OnSelectFile(wxCommandEvent&);
++    void OnSelectFile(wxCommandEvent&);
+     WizardDialog *p_parent;
+     wxWizardPage *p_prev;
+     wxWizardPage *p_next;
diff -r 9d0ad3d77d57 -r 10393af749c8 multimedia/vlc07/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc07/patches/patch-al Sat Dec 01 21:33:24 2007 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-al,v 1.1 2007/12/01 21:33:26 rillig Exp $
+
+Fixed "invalid lvalue". This code is similar to the code used in
+vlc-0.8, but doesn't cast pointers to ptrdiff_t.
+
+--- modules/video_filter/invert.c.orig 2004-04-23 20:02:22.000000000 +0000
++++ modules/video_filter/invert.c      2007-12-01 14:36:56.000000000 +0000
+@@ -212,19 +212,25 @@ static void Render( vout_thread_t *p_vou
+ 
+         for( ; p_in < p_in_end ; )
+         {
++            uint64_t *p_in64, *p_out64;
++
+             p_line_end = p_in + p_pic->p[i_index].i_visible_pitch - 64;
+ 
++            p_in64 = (uint64_t *)p_in;
++            p_out64 = (uint64_t *)p_out;
+             for( ; p_in < p_line_end ; )
+             {
+                 /* Do 64 pixels at a time */
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
+-                *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ );
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                *p_out64++ = ~(*p_in64++);
++                p_in += 64;
++                p_out += 64;
+             }
+ 
+             p_line_end += 64;