From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 6 15:10:09 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DD6B16A4B3 for ; Mon, 6 Oct 2003 15:10:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CBA643FF5 for ; Mon, 6 Oct 2003 15:10:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h96MA5FY011822 for ; Mon, 6 Oct 2003 15:10:05 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h96MA5aQ011821; Mon, 6 Oct 2003 15:10:05 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 6 Oct 2003 15:10:05 -0700 (PDT) Resent-Message-Id: <200310062210.h96MA5aQ011821@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Thomas E. Zander" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 431BA16A4B3 for ; Mon, 6 Oct 2003 15:00:40 -0700 (PDT) Received: from mailgate.rz.uni-karlsruhe.de (mailgate.rz.uni-karlsruhe.de [129.13.64.97]) by mx1.FreeBSD.org (Postfix) with ESMTP id 141B343FE5 for ; Mon, 6 Oct 2003 15:00:39 -0700 (PDT) (envelope-from riggs@o503.hadiko.de) Received: from o503.hadiko.de (hadio503.hadiko.uni-karlsruhe.de [172.20.45.138]) by mailgate.rz.uni-karlsruhe.de with esmtp (Exim 3.36 #1) id 1A6dPB-000763-00; Tue, 07 Oct 2003 00:00:37 +0200 Received: from o503.hadiko.de (RIXT@localhost [127.0.0.1]) by o503.hadiko.de (8.12.9p1/8.12.9) with ESMTP id h96M0bY6017882 for ; Tue, 7 Oct 2003 00:00:37 +0200 (CEST) (envelope-from riggs@o503.hadiko.de) Received: (from riggs@localhost) by o503.hadiko.de (8.12.9p1/8.12.9/Submit) id h96M0bUH017881; Tue, 7 Oct 2003 00:00:37 +0200 (CEST) (envelope-from riggs) Message-Id: <200310062200.h96M0bUH017881@o503.hadiko.de> Date: Tue, 7 Oct 2003 00:00:37 +0200 (CEST) From: "Thomas E. Zander" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/57687: maintainer combo update multimedia/mplayer* X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Oct 2003 22:10:09 -0000 >Number: 57687 >Category: ports >Synopsis: maintainer combo update multimedia/mplayer* >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 06 15:10:04 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Thomas E. Zander >Release: FreeBSD 5.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD o503.hadiko.de 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #1: Sun Oct 5 22:36:27 CEST 2003 root@o503.hadiko.de:/usr/obj/usr/src/sys/MARVIN i386 >Description: This update consists of mplayer-skins and mplayer itself Changes: mplayer-skins: o Import of Orange, a really pretty skin o Changing this little crazy EXTRACT_ONLY stuff. It still isn't perfect at all but for most users more comfortable I think. It only prompts twice :-) mplayer: o fix autodetection problem for freetype2 which breaks gmplayer for some machines, hopefully satisfying pr/57622 o RUN_DEPENDS on mplayer-skins if compiled WITH_GUI Suggested by Jeremy Messenger >How-To-Repeat: >Fix: Please apply attached patches to multimedia/mplayer and multimedia/mplayer-skins: diff -ruN mplayer-old/Makefile mplayer/Makefile --- mplayer-old/Makefile Sun Oct 5 20:21:37 2003 +++ mplayer/Makefile Mon Oct 6 23:22:04 2003 @@ -38,10 +38,11 @@ # (if not available) and then link mplayer against it. Then you'll # be able to use gmplayer, the graphical version of mplayer # -# WITH_FREETYPE +# WITHOUT_FREETYPE # default: undefined -# defining this will change mplayer's font display ability from bitmap -# fonts to truetype fonts +# since freetype is installed on almost any system people might want +# to run mplayer on, this port now defaults to freetype unless not +# defined otherwise # # # CPU features: @@ -166,7 +167,7 @@ PORTNAME= mplayer PORTVERSION= 0.92.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ @@ -306,6 +307,10 @@ WITH_LZO= yes .endif +.if exists(${LOCALBASE}/lib/libfreetype.so.9) && !defined(WITHOUT_FREETYPE) +WITH_FREETYPE= yes +.endif + .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif @@ -319,6 +324,7 @@ .if defined(WITH_GUI) USE_GNOME+= gtk12 +RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk .else @@ -454,6 +460,7 @@ LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 .else RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts +CONFIGURE_ARGS+= --disable-freetype .endif .if defined(WITH_XANIM) diff -ruN mplayer-skins-old/Makefile mplayer-skins/Makefile --- mplayer-skins-old/Makefile Fri Sep 12 16:03:52 2003 +++ mplayer-skins/Makefile Mon Oct 6 22:34:01 2003 @@ -6,8 +6,7 @@ # PORTNAME= mplayer -PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTVERSION= 1.1.0 CATEGORIES= multimedia MASTER_SITES= http://www.mplayerhq.hu/MPlayer/Skin/:Skin \ http://ftp.lug.udel.edu/MPlayer/Skin/:Skin \ @@ -15,7 +14,29 @@ ftp://ftp.lug.udel.edu/MPlayer/Skin/:Skin \ http://www.stud.uni-karlsruhe.de/~uedc/mplayer/:mini PKGNAMESUFFIX= -skins -DISTFILES= +DISTFILES= default-1.7.tar.bz2:Skin \ + AlienMind-1.1.tar.bz2:Skin \ + avifile-1.5.tar.bz2:Skin \ + BlueHeart-1.4.tar.bz2:Skin \ + CornerMP-1.0.tar.bz2:Skin \ + CornerMP-aqua-1.0.tar.bz2:Skin \ + Cyrus-1.0.tar.bz2:Skin \ + gnome-1.1.tar.bz2:Skin \ + hayraphon-1.0.tar.bz2:Skin \ + hwswskin-1.0.tar.bz2:Skin \ + mentalic-1.1.tar.bz2:Skin \ + MidnightLove-1.5.tar.bz2:Skin \ + neutron-1.4.tar.bz2:Skin \ + phony-1.0.tar.bz2:Skin \ + plastic-1.1.1.tar.bz2:Skin \ + proton-1.1.tar.bz2:Skin \ + slim-1.0.tar.bz2:Skin \ + trium-1.1.tar.bz2:Skin \ + WindowsMediaPlayer6-1.2.tar.bz2:Skin \ + xanim-1.5.tar.bz2:Skin \ + xine-lcd-1.0.tar.bz2:Skin \ + Orange-1.1.tar.bz2:Skin \ + mini-0.1.tar.bz2:mini EXTRACT_ONLY= DIST_SUBDIR= mplayer @@ -48,7 +69,7 @@ .endif # BATCH .if !defined(BATCH) -pre-fetch: +pre-everything:: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/choice @@ -87,118 +108,101 @@ WITH_SKIN_WINDOWSMEDIAPLAYER6=yes WITH_SKIN_XANIM=yes WITH_SKIN_XINE_LCD=yes +WITH_SKIN_ORANGE=yes WITH_SKIN_MINI=yes . endif # WITH_SKIN_ALL # -# files to fetch +# files to extract # -DISTFILES+= default-1.7.tar.bz2:Skin .ifdef(WITH_SKIN_DEFAULT) EXTRACT_ONLY+= default-1.7.tar.bz2 .endif -DISTFILES+= AlienMind-1.1.tar.bz2:Skin .ifdef(WITH_SKIN_ALIENMIND) EXTRACT_ONLY+= AlienMind-1.1.tar.bz2 .endif -DISTFILES+= avifile-1.5.tar.bz2:Skin .ifdef(WITH_SKIN_AVIFILE) EXTRACT_ONLY+= avifile-1.5.tar.bz2 .endif -DISTFILES+= BlueHeart-1.4.tar.bz2:Skin .ifdef(WITH_SKIN_BLUEHEART) EXTRACT_ONLY+= BlueHeart-1.4.tar.bz2 .endif -DISTFILES+= CornerMP-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_CORNERMP) EXTRACT_ONLY+= CornerMP-1.0.tar.bz2 .endif -DISTFILES+= CornerMP-aqua-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_CORNERMP_AGUA) EXTRACT_ONLY+= CornerMP-aqua-1.0.tar.bz2 .endif -DISTFILES+= Cyrus-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_CYRUS) EXTRACT_ONLY+= Cyrus-1.0.tar.bz2 .endif -DISTFILES+= gnome-1.1.tar.bz2:Skin .ifdef(WITH_SKIN_CYRUS) EXTRACT_ONLY+= gnome-1.1.tar.bz2 .endif -DISTFILES+= hayraphon-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_CYRUS) EXTRACT_ONLY+= hayraphon-1.0.tar.bz2 .endif -DISTFILES+= hwswskin-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_HWSW_SKIN) EXTRACT_ONLY+= hwswskin-1.0.tar.bz2 .endif -DISTFILES+= mentalic-1.1.tar.bz2:Skin .ifdef(WITH_SKIN_MENTALIC) EXTRACT_ONLY+= mentalic-1.1.tar.bz2 .endif -DISTFILES+= MidnightLove-1.5.tar.bz2:Skin .ifdef(WITH_SKIN_MIDNIGHTLOVE) EXTRACT_ONLY+= MidnightLove-1.5.tar.bz2 .endif -DISTFILES+= neutron-1.4.tar.bz2:Skin .ifdef(WITH_SKIN_NEUTRON) EXTRACT_ONLY+= neutron-1.4.tar.bz2 .endif -DISTFILES+= phony-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_PHONY) EXTRACT_ONLY+= phony-1.0.tar.bz2 .endif -DISTFILES+= plastic-1.1.1.tar.bz2:Skin .ifdef(WITH_SKIN_PLASTIC) EXTRACT_ONLY+= plastic-1.1.1.tar.bz2 .endif -DISTFILES+= proton-1.1.tar.bz2:Skin .ifdef(WITH_SKIN_PROTON) EXTRACT_ONLY+= proton-1.1.tar.bz2 .endif -DISTFILES+= slim-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_SLIM) EXTRACT_ONLY+= slim-1.0.tar.bz2 .endif -DISTFILES+= trium-1.1.tar.bz2:Skin .ifdef(WITH_SKIN_TRIUM) EXTRACT_ONLY+= trium-1.1.tar.bz2 .endif -DISTFILES+= WindowsMediaPlayer6-1.2.tar.bz2:Skin .ifdef(WITH_SKIN_WINDOWSMEDIAPLAYER6) EXTRACT_ONLY+= WindowsMediaPlayer6-1.2.tar.bz2 .endif -DISTFILES+= xanim-1.5.tar.bz2:Skin .ifdef(WITH_SKIN_XANIM) EXTRACT_ONLY+= xanim-1.5.tar.bz2 .endif -DISTFILES+= xine-lcd-1.0.tar.bz2:Skin .ifdef(WITH_SKIN_XINE_LCD) EXTRACT_ONLY+= xine-lcd-1.0.tar.bz2 .endif -DISTFILES+= mini-0.1.tar.bz2:mini +.ifdef(WITH_SKIN_ORANGE) +EXTRACT_ONLY+= Orange-1.1.tar.bz2 +.endif + .ifdef(WITH_SKIN_MINI) EXTRACT_ONLY+= mini-0.1.tar.bz2 .endif diff -ruN mplayer-skins-old/distinfo mplayer-skins/distinfo --- mplayer-skins-old/distinfo Fri Sep 12 16:03:52 2003 +++ mplayer-skins/distinfo Mon Oct 6 22:06:47 2003 @@ -4,7 +4,7 @@ MD5 (mplayer/BlueHeart-1.4.tar.bz2) = c38e378f24b9f0e041c98305fbef4a5d MD5 (mplayer/CornerMP-1.0.tar.bz2) = 64a1f4f2064d6af7cab7f0dcfc0450e5 MD5 (mplayer/CornerMP-aqua-1.0.tar.bz2) = 936f2aef3d5011b10b7610897074f409 -MD5 (mplayer/Cyrus-1.0.tar.bz2) = 029ef9e29aec05b73923ddb186c55e2c +MD5 (mplayer/Cyrus-1.0.tar.bz2) = 2f5d57c972683217ed64eb2f702a9e80 MD5 (mplayer/gnome-1.1.tar.bz2) = e7dbfbb2f433e82c91f4e2245c7114c3 MD5 (mplayer/hayraphon-1.0.tar.bz2) = 1dcfa8830ebd967db0cc24a5cc7748a4 MD5 (mplayer/hwswskin-1.0.tar.bz2) = cf8341b74a8b66e0acfaca5b5514d895 @@ -19,4 +19,5 @@ MD5 (mplayer/WindowsMediaPlayer6-1.2.tar.bz2) = 6717e3f57e9c808777ce8cfc370d194e MD5 (mplayer/xanim-1.5.tar.bz2) = 11c50f9eb970f08b4955bed6e3159d39 MD5 (mplayer/xine-lcd-1.0.tar.bz2) = 9e8a8ba86e46e714d1ef2e19d9a7e0cf +MD5 (mplayer/Orange-1.1.tar.bz2) = 89c336d264cf4a58f10d7fec5d907e81 MD5 (mplayer/mini-0.1.tar.bz2) = 2bd00a1202298e2b12021f5362649c7c diff -ruN mplayer-skins-old/scripts/choice mplayer-skins/scripts/choice --- mplayer-skins-old/scripts/choice Fri Mar 28 06:04:53 2003 +++ mplayer-skins/scripts/choice Mon Oct 6 23:05:36 2003 @@ -36,6 +36,7 @@ "WindowsMediaPlayer6" "no comment" OFF \ "Xanim" "xanim \"feeling\"" OFF \ "Xine-LCD" "MPlayer conversion of Xine's LCD skin" OFF \ + "Orange" "Very nice VCR lookalike skin" OFF \ "Mini" "Mplayer-plugin for mozilla" OFF \ 2> /tmp/mplayer-skins-checklist.$$ >Release-Note: >Audit-Trail: >Unformatted: