[PC-BSD Commits] r1563 - in pbibuild/modules/vlc: . overlay-dir/bin
svn at pcbsd.org
svn at pcbsd.org
Sun Mar 9 06:06:54 PST 2008
Author: thad
Date: 2008-03-09 07:06:54 -0700 (Sun, 09 Mar 2008)
New Revision: 1563
Modified:
pbibuild/modules/vlc/build.sh
pbibuild/modules/vlc/copy-files
pbibuild/modules/vlc/overlay-dir/bin/vlc.sh
pbibuild/modules/vlc/pbi.conf
Log:
fix vlc module so that it works without a modified buildworld
Modified: pbibuild/modules/vlc/build.sh
===================================================================
--- pbibuild/modules/vlc/build.sh 2008-03-08 20:25:27 UTC (rev 1562)
+++ pbibuild/modules/vlc/build.sh 2008-03-09 14:06:54 UTC (rev 1563)
@@ -10,3 +10,5 @@
##############################################################################
cd /usr/local/share/locale/
tar cpf - */LC_MESSAGES/vlc.mo | tar xpf - -C /pbi/share/locale
+cd /usr/local/lib
+rm *.a
Modified: pbibuild/modules/vlc/copy-files
===================================================================
--- pbibuild/modules/vlc/copy-files 2008-03-08 20:25:27 UTC (rev 1562)
+++ pbibuild/modules/vlc/copy-files 2008-03-09 14:06:54 UTC (rev 1563)
@@ -1,195 +1,81 @@
-/usr/local/bin/vlc* bin/
-/usr/local/lib/vlc/* lib/vlc/
-/usr/local/lib/libwx* autolibs/
-/usr/local/lib/libgst* autolibs/
-/usr/local/lib/libtar* autolibs/
+/usr/local/bin/vlc* bin/
+/usr/local/lib/vlc/* lib/vlc/
+/usr/local/lib/libwx* autolibs/
+/usr/local/lib/libgst* autolibs/
+/usr/local/lib/libtar* autolibs/
+/usr/local/lib/libmspack* autolibs/
+/usr/local/lib/libIDL-2* autolibs/
+/usr/local/lib/libORBit-2* autolibs/
+/usr/local/lib/libORBit-imodule-2* autolibs/
+/usr/local/lib/libORBitCosNaming-2* autolibs/
+/usr/local/lib/libSDL* autolibs/
+/usr/local/lib/libSDL_image* autolibs/
+/usr/local/lib/liba52* autolibs/
+/usr/local/lib/libaa* autolibs/
+/usr/local/lib/libavahi-client* autolibs/
+/usr/local/lib/libavahi-common* autolibs/
+/usr/local/lib/libavahi-core* autolibs/
+/usr/local/lib/libavahi-glib* autolibs/
+/usr/local/lib/libavahi-gobject* autolibs/
+/usr/local/lib/libavcodec* autolibs/
+/usr/local/lib/libavformat* autolibs/
+/usr/local/lib/libavutil* autolibs/
+/usr/local/lib/libbonobo-2* autolibs/
+/usr/local/lib/libbonobo-activation* autolibs/
+/usr/local/lib/libcdda_interface* autolibs/
+/usr/local/lib/libcdda_paranoia* autolibs/
+/usr/local/lib/libcddb* autolibs/
+/usr/local/lib/libcdio++* autolibs/
+/usr/local/lib/libcdio* autolibs/
+/usr/local/lib/libdaemon* autolibs/
+/usr/local/lib/libdbus-1* autolibs/
+/usr/local/lib/libdbus-glib-1* autolibs/
+/usr/local/lib/libdca* autolibs/
+/usr/local/lib/libdvbpsi* autolibs/
+/usr/local/lib/libdvdnav* autolibs/
+/usr/local/lib/libdvdread* autolibs/
+/usr/local/lib/libebml* autolibs/
+/usr/local/lib/libesd* autolibs/
+/usr/local/lib/libesddsp* autolibs/
+/usr/local/lib/libfaac* autolibs/
+/usr/local/lib/libfaad* autolibs/
+/usr/local/lib/libgconf-2* autolibs/
+/usr/local/lib/libgdbm* autolibs/
+/usr/local/lib/libgnomevfs-2* autolibs/
+/usr/local/lib/libgpac* autolibs/
+/usr/local/lib/libhal-storage* autolibs/
+/usr/local/lib/libhal* autolibs/
+/usr/local/lib/libhald_freebsd_probe* autolibs/
+/usr/local/lib/libhowl* autolibs/
+/usr/local/lib/libid3tag* autolibs/
+/usr/local/lib/libiso9660++* autolibs/
+/usr/local/lib/libiso9660* autolibs/
+/usr/local/lib/liblinc* autolibs/
+/usr/local/lib/libmatroska* autolibs/
+/usr/local/lib/libmodplug* autolibs/
+/usr/local/lib/libmp3lame* autolibs/
+/usr/local/lib/libmp4av* autolibs/
+/usr/local/lib/libmp4v2* autolibs/
+/usr/local/lib/libmpcdec* autolibs/
+/usr/local/lib/libmpeg2* autolibs/
+/usr/local/lib/libmpeg2convert* autolibs/
/usr/local/lib/libmspack* autolibs/
-/usr/local/lib/hacklocaledir.so autolibs/
-/usr/local/lib/libIDL-2.so autolibs/
-/usr/local/lib/libIDL-2.so.0 autolibs/
-/usr/local/lib/libORBit-2.so autolibs/
-/usr/local/lib/libORBit-2.so.0 autolibs/
-/usr/local/lib/libORBit-imodule-2.so autolibs/
-/usr/local/lib/libORBit-imodule-2.so.0 autolibs/
-/usr/local/lib/libORBitCosNaming-2.so autolibs/
-/usr/local/lib/libORBitCosNaming-2.so.0 autolibs/
-/usr/local/lib/libSDL.so autolibs/
-/usr/local/lib/libSDL.so.11 autolibs/
-/usr/local/lib/libSDL_image.so autolibs/
-/usr/local/lib/libSDL_image.so.1 autolibs/
-/usr/local/lib/liba52.so autolibs/
-/usr/local/lib/liba52.so.0 autolibs/
-/usr/local/lib/libaa.so autolibs/
-/usr/local/lib/libaa.so.1 autolibs/
-/usr/local/lib/libavahi-client.so autolibs/
-/usr/local/lib/libavahi-client.so.3 autolibs/
-/usr/local/lib/libavahi-common.so autolibs/
-/usr/local/lib/libavahi-common.so.3 autolibs/
-/usr/local/lib/libavahi-core.so autolibs/
-/usr/local/lib/libavahi-core.so.5 autolibs/
-/usr/local/lib/libavahi-glib.so autolibs/
-/usr/local/lib/libavahi-glib.so.1 autolibs/
-/usr/local/lib/libavahi-gobject.so autolibs/
-/usr/local/lib/libavahi-gobject.so.0 autolibs/
-/usr/local/lib/libavcodec.so autolibs/
-/usr/local/lib/libavcodec.so.1 autolibs/
-/usr/local/lib/libavcodec.so.51.44.0 autolibs/
-/usr/local/lib/libavformat.so autolibs/
-/usr/local/lib/libavformat.so.1 autolibs/
-/usr/local/lib/libavformat.so.51.14.0 autolibs/
-/usr/local/lib/libavutil.so autolibs/
-/usr/local/lib/libavutil.so.1 autolibs/
-/usr/local/lib/libavutil.so.49.5.0 autolibs/
-/usr/local/lib/libbonobo-2.so autolibs/
-/usr/local/lib/libbonobo-2.so.0 autolibs/
-/usr/local/lib/libbonobo-activation.so autolibs/
-/usr/local/lib/libbonobo-activation.so.4 autolibs/
-/usr/local/lib/libcdda_interface.so autolibs/
-/usr/local/lib/libcdda_interface.so.0 autolibs/
-/usr/local/lib/libcdda_interface.so.0.9.8 autolibs/
-/usr/local/lib/libcdda_paranoia.so autolibs/
-/usr/local/lib/libcdda_paranoia.so.0 autolibs/
-/usr/local/lib/libcdda_paranoia.so.0.9.8 autolibs/
-/usr/local/lib/libcddb.so autolibs/
-/usr/local/lib/libcddb.so.4 autolibs/
-/usr/local/lib/libcdio++.so autolibs/
-/usr/local/lib/libcdio++.so.0 autolibs/
-/usr/local/lib/libcdio.so autolibs/
-/usr/local/lib/libcdio.so.7 autolibs/
-/usr/local/lib/libdaemon.so autolibs/
-/usr/local/lib/libdaemon.so.0 autolibs/
-/usr/local/lib/libdbus-1.so autolibs/
-/usr/local/lib/libdbus-1.so.3 autolibs/
-/usr/local/lib/libdbus-glib-1.so autolibs/
-/usr/local/lib/libdbus-glib-1.so.2 autolibs/
-/usr/local/lib/libdca.so autolibs/
-/usr/local/lib/libdca.so.0 autolibs/
-/usr/local/lib/libdvbpsi.so autolibs/
-/usr/local/lib/libdvbpsi.so.5 autolibs/
-/usr/local/lib/libdvdnav.so autolibs/
-/usr/local/lib/libdvdnav.so.4 autolibs/
-/usr/local/lib/libdvdread.so autolibs/
-/usr/local/lib/libdvdread.so.5 autolibs/
-/usr/local/lib/libebml.so autolibs/
-/usr/local/lib/libebml.so.0 autolibs/
-/usr/local/lib/libesd.so autolibs/
-/usr/local/lib/libesd.so.2 autolibs/
-/usr/local/lib/libesddsp.so autolibs/
-/usr/local/lib/libesddsp.so.2 autolibs/
-/usr/local/lib/libfaac.so autolibs/
-/usr/local/lib/libfaac.so.0 autolibs/
-/usr/local/lib/libfaad.so autolibs/
-/usr/local/lib/libfaad.so.0 autolibs/
-/usr/local/lib/libgconf-2.so autolibs/
-/usr/local/lib/libgconf-2.so.4 autolibs/
-/usr/local/lib/libgdbm.so autolibs/
-/usr/local/lib/libgdbm.so.3 autolibs/
-/usr/local/lib/libgnomevfs-2.so autolibs/
-/usr/local/lib/libgnomevfs-2.so.0 autolibs/
-/usr/local/lib/libgpac.so autolibs/
-/usr/local/lib/libgpac.so.1 autolibs/
-/usr/local/lib/libhal-storage.so autolibs/
-/usr/local/lib/libhal-storage.so.1 autolibs/
-/usr/local/lib/libhal.so autolibs/
-/usr/local/lib/libhal.so.1 autolibs/
-/usr/local/lib/libhald_freebsd_probe.so autolibs/
-/usr/local/lib/libhald_freebsd_probe.so.0 autolibs/
-/usr/local/lib/libhowl.so autolibs/
-/usr/local/lib/libhowl.so.0 autolibs/
-/usr/local/lib/libid3tag.so autolibs/
-/usr/local/lib/libid3tag.so.0 autolibs/
-/usr/local/lib/libiso9660++.so autolibs/
-/usr/local/lib/libiso9660++.so.0 autolibs/
-/usr/local/lib/libiso9660.so autolibs/
-/usr/local/lib/libiso9660.so.5 autolibs/
-/usr/local/lib/liblinc.so autolibs/
-/usr/local/lib/liblinc.so.1 autolibs/
-/usr/local/lib/libmatroska.so autolibs/
-/usr/local/lib/libmatroska.so.0 autolibs/
-/usr/local/lib/libmodplug.so autolibs/
-/usr/local/lib/libmodplug.so.0 autolibs/
-/usr/local/lib/libmp3lame.so autolibs/
-/usr/local/lib/libmp3lame.so.0 autolibs/
-/usr/local/lib/libmp4av.so autolibs/
-/usr/local/lib/libmp4av.so.0 autolibs/
-/usr/local/lib/libmp4v2.so autolibs/
-/usr/local/lib/libmp4v2.so.0 autolibs/
-/usr/local/lib/libmpcdec.so autolibs/
-/usr/local/lib/libmpcdec.so.5 autolibs/
-/usr/local/lib/libmpeg2.so autolibs/
-/usr/local/lib/libmpeg2.so.0 autolibs/
-/usr/local/lib/libmpeg2convert.so autolibs/
-/usr/local/lib/libmpeg2convert.so.0 autolibs/
-/usr/local/lib/libmpeg4ip_gnu.so autolibs/
-/usr/local/lib/libmpeg4ip_gnu.so.0 autolibs/
-/usr/local/lib/libmspack.so autolibs/
-/usr/local/lib/libmspack.so.1 autolibs/
-/usr/local/lib/libnotify.so autolibs/
-/usr/local/lib/libnotify.so.1 autolibs/
-/usr/local/lib/libopendaap.so autolibs/
-/usr/local/lib/libopendaap.so.0 autolibs/
-/usr/local/lib/libpolkit.so autolibs/
-/usr/local/lib/libpolkit.so.0 autolibs/
-/usr/local/lib/libpopt.so autolibs/
-/usr/local/lib/libpopt.so.0 autolibs/
-/usr/local/lib/libpostproc.so autolibs/
-/usr/local/lib/libpostproc.so.1 autolibs/
-/usr/local/lib/libpostproc.so.51.1.0 autolibs/
-/usr/local/lib/libpython2.5.so autolibs/
-/usr/local/lib/libpython2.5.so.1 autolibs/
-/usr/local/lib/libslp.so autolibs/
-/usr/local/lib/libslp.so.1 autolibs/
-/usr/local/lib/libsmbclient.so autolibs/
-/usr/local/lib/libsmbclient.so.0 autolibs/
-/usr/local/lib/libspeex.so autolibs/
-/usr/local/lib/libspeex.so.1 autolibs/
-/usr/local/lib/libtar.so autolibs/
-/usr/local/lib/libtar.so.0 autolibs/
-/usr/local/lib/libtheora.so autolibs/
-/usr/local/lib/libtheora.so.0 autolibs/
-/usr/local/lib/libtwolame.so autolibs/
-/usr/local/lib/libtwolame.so.0 autolibs/
-/usr/local/lib/libudf.so autolibs/
-/usr/local/lib/libudf.so.0 autolibs/
-/usr/local/lib/libvcdinfo.so autolibs/
-/usr/local/lib/libvcdinfo.so.2 autolibs/
-/usr/local/lib/libvga.so autolibs/
-/usr/local/lib/libvga.so.1 autolibs/
-/usr/local/lib/libvgagl.so autolibs/
-/usr/local/lib/libvgagl.so.1 autolibs/
-/usr/local/lib/libvolume_id.so autolibs/
-/usr/local/lib/libvolume_id.so.0 autolibs/
-/usr/local/lib/libwx_baseu-2.6.so autolibs/
-/usr/local/lib/libwx_baseu-2.6.so.0 autolibs/
-/usr/local/lib/libwx_baseu-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_baseu_net-2.6.so autolibs/
-/usr/local/lib/libwx_baseu_net-2.6.so.0 autolibs/
-/usr/local/lib/libwx_baseu_net-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_baseu_xml-2.6.so autolibs/
-/usr/local/lib/libwx_baseu_xml-2.6.so.0 autolibs/
-/usr/local/lib/libwx_baseu_xml-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_adv-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_adv-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_adv-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_core-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_core-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_core-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_gl-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_gl-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_gl-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_html-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_html-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_html-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_media-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_media-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_media-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_qa-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_qa-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_qa-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libwx_gtk2u_xrc-2.6.so autolibs/
-/usr/local/lib/libwx_gtk2u_xrc-2.6.so.0 autolibs/
-/usr/local/lib/libwx_gtk2u_xrc-2.6.so.0.3.1 autolibs/
-/usr/local/lib/libx264.so autolibs/
-/usr/local/lib/libx264.so.50 autolibs/
-/usr/local/lib/libmp* autolibs/
-/usr/local/share/vlc/* share/vlc/
+/usr/local/lib/libnotify* autolibs/
+/usr/local/lib/libopendaap* autolibs/
+/usr/local/lib/libpolkit* autolibs/
+/usr/local/lib/libpopt* autolibs/
+/usr/local/lib/libpostproc* autolibs/
+/usr/local/lib/libpython2* autolibs/
+/usr/local/lib/libslp* autolibs/
+/usr/local/lib/libsmbclient* autolibs/
+/usr/local/lib/libspeex* autolibs/
+/usr/local/lib/libtar* autolibs/
+/usr/local/lib/libtheora* autolibs/
+/usr/local/lib/libtwolame* autolibs/
+/usr/local/lib/libudf* autolibs/
+/usr/local/lib/libvcdinfo* autolibs/
+/usr/local/lib/libvga* autolibs/
+/usr/local/lib/libvgagl* autolibs/
+/usr/local/lib/libvolume_id* autolibs/
+/usr/local/lib/libx264* autolibs/
+/usr/local/share/vlc/* share/vlc/
Modified: pbibuild/modules/vlc/overlay-dir/bin/vlc.sh
===================================================================
--- pbibuild/modules/vlc/overlay-dir/bin/vlc.sh 2008-03-08 20:25:27 UTC (rev 1562)
+++ pbibuild/modules/vlc/overlay-dir/bin/vlc.sh 2008-03-09 14:06:54 UTC (rev 1563)
@@ -1,6 +1,15 @@
#!/bin/sh
-echo "LANG: `locale`"
-export LC_ALL="`locale | grep LC_MESSAGES | cut -d "=" -f2`"
+findLocale()
+{ if [ "`echo $LANG | grep :`" != "" ]
+ then
+ LANG="`echo $LANG | cut -d ":" -f1`"
+ fi
+ LOCALELIST="`cd /usr/local/share/locale && ls | grep -v UTF-8 | grep $LANG | grep _`"
+ echo "`echo $LOCALELIST | cut -d \" \" -f1`.UTF-8"
+}
+#echo "LANG:$LANG"
+LANG="`findLocale`"
+#echo "`locale`"
cd
-vlc
+vlc $@
Modified: pbibuild/modules/vlc/pbi.conf
===================================================================
--- pbibuild/modules/vlc/pbi.conf 2008-03-08 20:25:27 UTC (rev 1562)
+++ pbibuild/modules/vlc/pbi.conf 2008-03-09 14:06:54 UTC (rev 1563)
@@ -28,10 +28,43 @@
OTHERPORT=""
# Enter your custom make options here
-MAKEOPTS=""
+MAKEOPTS="WITH_A52=true
+WITHOUT_AALIB=true
+WITH_AVAHI=true
+WITHOUT_CACA=true
+WITH_ARTS=true
+WITHOUT_CORBA=true
+WITH_DAAP=true
+WITHOUT_DEBUG=true
+WITH_DTS=true
+WITH_ESOUND=true
+WITH_FAAC=true
+WITH_FAAD=true
+WITH_FLAC=true
+WITH_HTTPD=true
+WITH_LAME=true
+WITH_LIVEMEDIA=true
+WITH_MAD=true
+WITH_MATROSKA=true
+WITH_MPEG2=true
+WITHOUT_NCURSES=true
+WITH_OGG=true
+WITH_REALAUDIO=true
+WITH_SAMBA=true
+WITH_SDL=true
+WITHOUT_SVG=true
+WITHOUT_SVGALIB=true
+WITHOUT_SHOUT=true
+WITH_SKINS=true
+WITH_SPEEX=true
+WITH_THEORA=true
+WITH_TWOLAME=true
+WITH_VORBIS=true
+WITH_WIN32_CODECS=false
+WITH_X264=true"
# Build Key - Change this to anything else to trigger a rebuild
# - The rebuild will take place even if port is still the same ver
-BUILDKEY="10"
+BUILDKEY="12"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
More information about the Commits
mailing list