From owner-freebsd-multimedia@FreeBSD.ORG Mon Feb 26 15:11:21 2007 Return-Path: X-Original-To: multimedia@FreeBSD.org Delivered-To: freebsd-multimedia@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ADD8116A401; Mon, 26 Feb 2007 15:11:21 +0000 (UTC) (envelope-from mi+kde@aldan.algebra.com) Received: from aldan.algebra.com (aldan.algebra.com [216.254.65.224]) by mx1.freebsd.org (Postfix) with ESMTP id 2E86813C46B; Mon, 26 Feb 2007 15:11:20 +0000 (UTC) (envelope-from mi+kde@aldan.algebra.com) Received: from aldan.algebra.com (aldan [127.0.0.1]) by aldan.algebra.com (8.13.8/8.13.8) with ESMTP id l1QEgRaZ003548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 26 Feb 2007 09:42:27 -0500 (EST) (envelope-from mi+kde@aldan.algebra.com) Received: from localhost (localhost [[UNIX: localhost]]) by aldan.algebra.com (8.13.8/8.13.8/Submit) id l1QEgRnX003547; Mon, 26 Feb 2007 09:42:27 -0500 (EST) (envelope-from mi+kde@aldan.algebra.com) From: Mikhail Teterin To: multimedia@FreeBSD.org, ahze@FreeBSD.org, mezz@FreeBSD.org Date: Mon, 26 Feb 2007 09:42:26 -0500 User-Agent: KMail/1.9.5 X-Face: %UW#n0|w>ydeGt/b@1-.UFP=K^~-:0f#O:D7whJ5G_<5143Bb3kOIs9XpX+"V+~$adGP:J|SLieM31VIhqXeLBli" Cc: Subject: improving vlc-devel X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 15:11:21 -0000 --Boundary-00=_THv4FpGLrOFX9wr Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello! Attached is a patch, that fixes two minor annoyances with the port: . removes "BROKEN" on amd64 -- just built it fine on my system; . removes explicit requirements for shared libraries' major numbers. There are several commits in the Makefile's cvs log, which do nothing but "chase" these numbers -- that's a foolish excercise. Vlc (and most other software) almost never care for a particular version of a dependency and the shlib major number should only be specified explicitly, when needed -- ommited _by default_ (vlc's own configure-script is better at detecting such incompatibilities anyway). Doing otherwise requires too many rebuilds to make sense -- in order to build a fresh version of vlc, for example, one has to rebuild gaim too, because vlc explicitly requires gnutls.15, whereas one's existing gaim install may refer to gnutls.12... Please, consider the attached patch. Thank you very much for your time, -mi --Boundary-00=_THv4FpGLrOFX9wr Content-Type: text/x-diff; charset="us-ascii"; name="vlc.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="vlc.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc-devel/Makefile,v retrieving revision 1.167 diff -U2 -r1.167 Makefile --- Makefile 25 Feb 2007 20:05:27 -0000 1.167 +++ Makefile 26 Feb 2007 14:39:47 -0000 @@ -23,6 +23,6 @@ COMMENT= Multimedia streaming server and player for various audio/video formats -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ - avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify \ + avcodec:${PORTSDIR}/multimedia/ffmpeg-devel RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera @@ -102,8 +102,4 @@ .include -.if ${ARCH} == "amd64" -BROKEN= Does not compile on ${ARCH} -.endif - .if ${PERL_LEVEL} < 500800 BROKEN= Does not compile with perl ${PERL_VERSION} @@ -172,5 +168,5 @@ .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) -LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar +LIB_DEPENDS+= tar:${PORTSDIR}/devel/libtar CONFIGURE_ARGS+=--enable-skins2 .undef WITHOUT_WXGTK @@ -195,5 +191,5 @@ .if !defined(WITHOUT_HAL) -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+=--enable-hal .else @@ -202,5 +198,5 @@ .if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS) -LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts +LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts CONFIGURE_ARGS+= --enable-arts .else @@ -209,5 +205,5 @@ .if !defined(WITHOUT_AVAHI) -LIB_DEPENDS+= avahi-common.3:${PORTSDIR}/net/avahi +LIB_DEPENDS+= avahi-common:${PORTSDIR}/net/avahi CONFIGURE_ARGS+= --enable-bonjour .else @@ -216,6 +212,6 @@ .if !defined(WITHOUT_CDROM) -LIB_DEPENDS+= vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \ - cdio.7:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= vcdinfo:${PORTSDIR}/multimedia/vcdimager \ + cdio:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+=--enable-vcd \ --enable-libcddb \ @@ -229,5 +225,5 @@ .if !defined(WITHOUT_CDPARANOIA) && !defined(WITHOUT_CDROM) -LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia +LIB_DEPENDS+= cdda_interface:${PORTSDIR}/audio/cdparanoia CONFIGURE_ARGS+=--enable-cdda \ --enable-cddax @@ -245,5 +241,5 @@ .if !defined(WITHOUT_DVBPSI) -LIB_DEPENDS+= dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi +LIB_DEPENDS+= dvbpsi:${PORTSDIR}/multimedia/libdvbpsi CONFIGURE_ARGS+=--enable-dvbpsi \ --with-dvbpsi=${LOCALBASE} @@ -253,5 +249,5 @@ .if !defined(WITHOUT_DVDNAV) -LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav +LIB_DEPENDS+= dvdnav:${PORTSDIR}/multimedia/libdvdnav CONFIGURE_ARGS+=--enable-dvdnav .else @@ -260,5 +256,5 @@ .if defined(WITH_DVDREAD) && !defined(WITHOUT_DVDREAD) -LIB_DEPENDS+= dvdread.3:${PORTSDIR}/multimedia/libdvdread +LIB_DEPENDS+= dvdread:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ARGS+=--enable-dvdread .else @@ -275,9 +271,9 @@ .if defined(WITH_FAAC) && !defined(WITHOUT_FAAC) CONFIGURE_ARGS+=--with-ffmpeg-faac -LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac +LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac .endif .if (defined(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.a)) && !defined(WITHOUT_FAAD) -LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad CONFIGURE_ARGS+=--enable-faad .else @@ -286,5 +282,5 @@ .if (defined(WITH_FLAC) || exists(${LOCALBASE}/lib/libFLAC.a)) && !defined(WITHOUT_FLAC) -LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac CONFIGURE_ARGS+=--enable-flac .else @@ -293,5 +289,5 @@ .if (defined(WITH_FRIBIDI) || exists(${LOCALBASE}/bin/fribidi-config)) && !defined(WITHOUT_FRIBIDI) -LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi +LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+=--enable-fribidi .else @@ -300,5 +296,5 @@ .if (defined(WITH_AALIB) || exists(${LOCALBASE}/lib/libaa.so.1)) && !defined(WITHOUT_AALIB) -LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib +LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+=--enable-aa .else @@ -307,5 +303,5 @@ .if (defined(WITH_DIRAC) || exists(${LOCALBASE}/lib/libdirac_decoder.a)) && !defined(WITHOUT_DIRAC) -LIB_DEPENDS+= dirac_encoder.0:${PORTSDIR}/multimedia/dirac +LIB_DEPENDS+= dirac_encoder:${PORTSDIR}/multimedia/dirac CONFIGURE_ARGS+=--enable-dirac CPPFLAGS+= -I${LOCALBASE}/include/dirac @@ -316,5 +312,5 @@ .if !defined(WITHOUT_X264) CONFIGURE_ARGS+=--enable-x264 -LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264 +LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 .else CONFIGURE_ARGS+=--disable-x264 @@ -334,5 +330,5 @@ .if !defined(WITHOUT_DAAP) -LIB_DEPENDS+= opendaap.0:${PORTSDIR}/devel/libopendaap +LIB_DEPENDS+= opendaap:${PORTSDIR}/devel/libopendaap CONFIGURE_ARGS+=--enable-daap .else @@ -352,5 +348,5 @@ .if (defined(WITH_GGI) || exists(${LOCALBASE}/lib/libggi.a)) && !defined(WITHOUT_GGI) -LIB_DEPENDS+= ggi.2:${PORTSDIR}/graphics/libggi +LIB_DEPENDS+= ggi:${PORTSDIR}/graphics/libggi CONFIGURE_ARGS+=--enable-ggi .else @@ -361,5 +357,5 @@ # lame can NOT be packaged. .if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING) -LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame +LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame CONFIGURE_ARGS+=--enable-mp3lame .else @@ -368,5 +364,5 @@ .if !defined(WITHOUT_MATROSKA) -LIB_DEPENDS+= matroska.0:${PORTSDIR}/multimedia/libmatroska +LIB_DEPENDS+= matroska:${PORTSDIR}/multimedia/libmatroska CONFIGURE_ARGS+=--enable-mkv .else @@ -375,5 +371,5 @@ .if !defined(WITHOUT_A52) -LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 +LIB_DEPENDS+= a52:${PORTSDIR}/audio/liba52 CONFIGURE_ARGS+=--enable-a52 .else @@ -391,5 +387,5 @@ .if !defined(WITHOUT_MPEG2) -LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 +LIB_DEPENDS+= mpeg2:${PORTSDIR}/multimedia/libmpeg2 CONFIGURE_ARGS+=--enable-libmpeg2 .else @@ -403,10 +399,10 @@ .if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT) -LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= shout:${PORTSDIR}/audio/libshout2 CONFIGURE_ARGS+= --enable-shout .endif .if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA) -LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+=--enable-theora .else @@ -423,6 +419,6 @@ .if !defined(WITHOUT_MAD) -LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag \ - mad.2:${PORTSDIR}/audio/libmad +LIB_DEPENDS+= id3tag:${PORTSDIR}/audio/libid3tag \ + mad:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+=--enable-mad \ --with-mad=${LOCALBASE} @@ -432,5 +428,5 @@ .if !defined(WITHOUT_MODDEMUX) -LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug +LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug CONFIGURE_ARGS+=--enable-mod .else @@ -439,5 +435,5 @@ .if !defined(WITHOUT_MPCDEMUX) -LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec +LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/libmpcdec CONFIGURE_ARGS+=--enable-mpc .else @@ -446,5 +442,5 @@ .if !defined(WITHOUT_OGG) -LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg CONFIGURE_ARGS+=--enable-ogg .else @@ -465,5 +461,5 @@ .if !defined(WITHOUT_SAMBA) -LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient CONFIGURE_ARGS+=--enable-smb .else @@ -483,5 +479,5 @@ .if !defined(WITHOUT_HTTPD) -LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--enable-gnutls .else @@ -490,5 +486,5 @@ .if !defined(WITHOUT_SLP) -LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp +LIB_DEPENDS+= slp:${PORTSDIR}/net/openslp .else CONFIGURE_ARGS+=--disable-slp @@ -496,5 +492,5 @@ .if !defined(WITHOUT_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex CONFIGURE_ARGS+=--enable-speex CPPFLAGS+=-I${LOCALBASE}/include/speex @@ -515,5 +511,5 @@ .if (defined(WITH_SVGALIB) || exists(${LOCALBASE}/lib/lib/vga.a)) && !defined(WITHOUT_SVGALIB) -LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib +LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib CONFIGURE_ARGS+=--enable-svgalib .else @@ -522,5 +518,5 @@ .if (defined(WITH_TREMOR) || exists(${LOCALBASE}/lib/libvorbisidec.a)) && !defined(WITHOUT_TREMOR) -LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor +LIB_DEPENDS+= vorbisidec:${PORTSDIR}/audio/libtremor .else CONFIGURE_ARGS+=--disable-tremor @@ -528,5 +524,5 @@ .if (defined(WITH_TWOLAME) || exists(${LOCALBASE}/lib/libtwolame.a)) && !defined(WITHOUT_TWOLAME) -LIB_DEPENDS+= twolame.0:${PORTSDIR}/audio/twolame +LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame CONFIGURE_ARGS+= --enable-twolame .else @@ -535,5 +531,5 @@ .if !defined(WITHOUT_VORBIS) -LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis .else @@ -542,5 +538,5 @@ .if (defined(WITH_XOSD) || exists(${LOCALBASE}/lib/libxosd.a)) && !defined(WITHOUT_XOSD) -LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd +LIB_DEPENDS+= xosd:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+=--enable-xosd .else --Boundary-00=_THv4FpGLrOFX9wr--