Author: pebender
Date: Thu Jun 25 19:02:25 2009
New Revision: 5060
Added:
trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.0-rc4-duplicate_headers.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/mediaplayers/vlc/Makefile
trunk/gar-minimyth/script/mediaplayers/vlc/checksums
Log:
- Fixed bugs in mediaplayers/vlc exposed by upgrading to automake 1.11.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Thu Jun 25
19:02:25 2009
@@ -98,9 +98,9 @@
- Patched net/ntp so that it builds with glibc 2.10.
- Patched net/openssh so that it uses an abstract namespace socket when
attempting to connect to the X server.
- - Patched xorg-7.4/xorg-server and mediaplayers/xine-ui so that they do
- not contain duplicate entries in Makefile.am as the duplicate entries
- cause a problem with automake 1.11.
+ - Patched xorg-7.4/xorg-server, mediaplayers/vlc and
mediaplayers/xine-ui
+ so that they do not contain duplicate entries in Makefile.am as the
+ duplicate entries cause a problem with automake 1.11.
Removed packages
Removed kernel-2.6.26/linux.
Modified: trunk/gar-minimyth/script/mediaplayers/vlc/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/vlc/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/vlc/Makefile Thu Jun 25 19:02:25
2009
@@ -4,7 +4,7 @@
MASTER_SITES =
http://download.videolan.org/pub/videolan/$(GARNAME)/$(GARVERSION)/
MASTER_SITES +=
http://download.videolan.org/pub/videolan/testing/$(DISTNAME)/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-vaapi.patch $(DISTNAME)-no_xcb.patch
$(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME)-duplicate_headers.patch $(DISTNAME)-vaapi.patch
$(DISTNAME)-no_xcb.patch $(DISTNAME).patch.gar
LICENSE = GPL2
DESCRIPTION =
@@ -232,6 +232,8 @@
CXXFLAGS += -DHAVE_AVCODEC_VAAPI
pre-configure:
+ @cd $(WORKSRC) ; aclocal --verbose --force -I m4
+ @cd $(WORKSRC) ; automake --foreign --add-missing --ignore-deps
@$(call FIX_LIBTOOL,$(WORKSRC),configure)
@$(MAKECOOKIE)
Modified: trunk/gar-minimyth/script/mediaplayers/vlc/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/vlc/checksums (original)
+++ trunk/gar-minimyth/script/mediaplayers/vlc/checksums Thu Jun 25
19:02:25 2009
@@ -1,4 +1,5 @@
d8cefe26c0b734777c371db163c09bda download/vlc-1.0.0-rc4.tar.bz2
+34d9c82dbcb972fa5bfeaa4ab715c8fe
download/vlc-1.0.0-rc4-duplicate_headers.patch
341634eb5c051bc531b66927e2c74bde download/vlc-1.0.0-rc4-vaapi.patch
2058e5d5d8989a56aed5802b752090e0 download/vlc-1.0.0-rc4-no_xcb.patch
3bbe1ddc7715c34794a9836698f81a9f download/vlc-1.0.0-rc4.patch.gar
Added:
trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.0-rc4-duplicate_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.0-rc4-duplicate_headers.patch
Thu Jun 25 19:02:25 2009
@@ -0,0 +1,11 @@
+diff -Naur vlc-1.0.0-rc4-old/src/Makefile.am
vlc-1.0.0-rc4-new/src/Makefile.am
+--- vlc-1.0.0-rc4-old/src/Makefile.am 2009-06-10 09:42:12.000000000 -0700
++++ vlc-1.0.0-rc4-new/src/Makefile.am 2009-06-25 18:34:03.000000000 -0700
+@@ -29,7 +29,6 @@
+ ../include/vlc/deprecated.h \
+ ../include/vlc/libvlc.h \
+ ../include/vlc/libvlc_events.h \
+- ../include/vlc/libvlc_media_list.h \
+ ../include/vlc/libvlc_media.h \
+ ../include/vlc/libvlc_media_discoverer.h \
+ ../include/vlc/libvlc_media_library.h \
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
