Date: Wed, 23 Jan 2008 18:42:07 GMT From: "Rashid N. \"Citycat\" Achilov" <citycat4@ngs.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/119927: latest for KDE3 kplayer's version Message-ID: <200801231842.m0NIg7F3068389@www.freebsd.org> Resent-Message-ID: <200801231850.m0NIo0SX043070@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119927
>Category: ports
>Synopsis: latest for KDE3 kplayer's version
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 23 18:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Rashid N. "Citycat" Achilov
>Release: 6.3-PRERELEASE
>Organization:
Cat's Home
>Environment:
FreeBSD vmfree.shelton.net 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #29: Wed Jan 16 00:52:10 NOVT 2008 root@vmfree.shelton.net:/usr/obj/usr/src/sys/VmFree i386
>Description:
This patch updates kplayer port up to latest version for KDE3. This day kplayer-0.7 already available, but it depends from KDE4 and uses CMake for building
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN kplayer/Makefile kplayer.new/Makefile
--- kplayer/Makefile 2007-05-20 03:17:40.000000000 +0700
+++ kplayer.new/Makefile 2008-01-19 03:15:07.000000000 +0600
@@ -6,8 +6,7 @@
#
PORTNAME= kplayer
-PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTVERSION= 0.6.3
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,6 +14,8 @@
MAINTAINER= se@FreeBSD.org
COMMENT= Movie player based on mplayer
+BUILD_DEPENDS= autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper \
+ automake-wrapper:${PORTSDIR}/devel/automake-wrapper
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
USE_BZIP2= yes
@@ -22,6 +23,14 @@
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15 automake:19 autoheader:261 autoconf:261
+
+pre-configure:
+ (cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile.dist);
+
+run-autotools-automake:
+ cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} \
+ ${AUTOMAKE} ${AUTOMAKE_ARGS}
+ cd ${WRKSRC} && ${PERL5} admin/am_edit
.include <bsd.port.mk>
diff -ruN kplayer/distinfo kplayer.new/distinfo
--- kplayer/distinfo 2006-01-23 03:19:38.000000000 +0600
+++ kplayer.new/distinfo 2007-09-28 03:31:03.000000000 +0700
@@ -1,3 +1,3 @@
-MD5 (kplayer-0.5.3.tar.bz2) = ea7398f96efa2f01ac875c548ab01878
-SHA256 (kplayer-0.5.3.tar.bz2) = d08ab0046734294eea59818395a023426fa722fbe8baccad26081bfcb9e8c9cf
-SIZE (kplayer-0.5.3.tar.bz2) = 3156593
+MD5 (kplayer-0.6.3.tar.bz2) = f55dab07cefb666f745015ac4dc5de2a
+SHA256 (kplayer-0.6.3.tar.bz2) = 750c8f3d4e3e3d7bcf79c8a3a626f894d3f32089ceee59fba9300a54db4919cc
+SIZE (kplayer-0.6.3.tar.bz2) = 4912815
diff -ruN kplayer/files/patch-cvs.sh kplayer.new/files/patch-cvs.sh
--- kplayer/files/patch-cvs.sh 1970-01-01 07:00:00.000000000 +0700
+++ kplayer.new/files/patch-cvs.sh 2008-01-23 23:45:26.000000000 +0600
@@ -0,0 +1,100 @@
+--- admin/cvs.sh 2007-02-26 23:59:34.000000000 +0600
++++ admin/cvs.sh.new 2008-01-23 23:44:07.000000000 +0600
+@@ -27,11 +27,27 @@
+ fi
+ }
+
++# Build tool name from version line and name
++# $1 is tool name
++# $2 is tool name variable. So, i.e. $1 may be $AUTOCONF, $2 - AUTOCONF
++build_toolname()
++{
++ local _autotool
++
++ aa=`$1 --version`
++ echo "aa is $aa"
++ _autotool=`$1 --version | head -n 1 | awk '{print $4}'`
++ echo "_autotool=$_autotool"
++ eval "$2_TOOL=${1##*/}-$_autotool"
++}
++
+ check_autotool_versions()
+ {
+ required_autoconf_version="2.53 or newer"
+-AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+-case $AUTOCONF_VERSION in
++
++build_toolname $AUTOCONF AUTOCONF
++
++case $AUTOCONF_TOOL in
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+@@ -39,14 +55,15 @@
+ exit 1
+ ;;
+ * )
+- echo "*** YOU'RE USING $AUTOCONF_VERSION."
++ echo "*** YOU'RE USING $AUTOCONF_TOOL."
+ echo "*** KDE requires autoconf $required_autoconf_version"
+ exit 1
+ ;;
+ esac
+
+-AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+-case $AUTOHEADER_VERSION in
++build_toolname $AUTOHEADER AUTOHEADER
++
++case $AUTOHEADER_TOOL in
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+@@ -54,22 +71,23 @@
+ exit 1
+ ;;
+ * )
+- echo "*** YOU'RE USING $AUTOHEADER_VERSION."
++ echo "*** YOU'RE USING $AUTOHEADER_TOOL."
+ echo "*** KDE requires autoheader $required_autoconf_version"
+ exit 1
+ ;;
+ esac
+
+-AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
++build_toolname $AUTOMAKE AUTOMAKE
+ required_automake_version="1.6.1 or newer"
+-case $AUTOMAKE_STRING in
++
++case $AUTOMAKE_TOOL in
+ automake*1.5d* | automake*1.5* | automake*1.5-* )
+- echo "*** YOU'RE USING $AUTOMAKE_STRING."
++ echo "*** YOU'RE USING $AUTOMAKE_TOOL."
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+ ;;
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1*)
+- echo "*** $AUTOMAKE_STRING found."
++ echo "*** $AUTOMAKE_TOOL found."
+ UNSERMAKE=no
+ ;;
+ "" )
+@@ -83,7 +101,7 @@
+ UNSERMAKE=unsermake
+ ;;
+ * )
+- echo "*** YOU'RE USING $AUTOMAKE_STRING."
++ echo "*** YOU'RE USING $AUTOMAKE_TOOL."
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+ ;;
+@@ -223,8 +241,8 @@
+ $AUTOHEADER
+ touch config.h.in
+ $AUTOMAKE
+-AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+-case $AUTOMAKE_STRING in
++AUTOMAKE_TOOL=`$AUTOMAKE --version | head -n 1`
++case $AUTOMAKE_TOOL in
+ *unsermake* ) :
+ ;;
+ *)
diff -ruN kplayer/files/patch-kplayerproperties.h kplayer.new/files/patch-kplayerproperties.h
--- kplayer/files/patch-kplayerproperties.h 2004-10-16 15:10:34.000000000 +0700
+++ kplayer.new/files/patch-kplayerproperties.h 1970-01-01 07:00:00.000000000 +0700
@@ -1,11 +0,0 @@
---- kplayer/kplayerproperties.h.orig Sat Oct 16 01:58:03 2004
-+++ kplayer/kplayerproperties.h Sat Oct 16 01:58:43 2004
-@@ -349,7 +349,7 @@
- // Advanced properties
-
- QString executablePathValue (void) const
-- { return m_executable_path.isEmpty() ? "mplayer" : m_executable_path; }
-+ { return m_executable_path.isEmpty() ? QString::fromLatin1("mplayer") : m_executable_path; }
- void setExecutablePathValue (QString path)
- { m_executable_path = path; }
-
diff -ruN kplayer/files/patch-kplayerpropertiesdialog.cpp kplayer.new/files/patch-kplayerpropertiesdialog.cpp
--- kplayer/files/patch-kplayerpropertiesdialog.cpp 2004-10-16 15:10:34.000000000 +0700
+++ kplayer.new/files/patch-kplayerpropertiesdialog.cpp 1970-01-01 07:00:00.000000000 +0700
@@ -1,112 +0,0 @@
---- kplayer/kplayerpropertiesdialog.cpp.orig Sat Oct 16 02:14:58 2004
-+++ kplayer/kplayerpropertiesdialog.cpp Sat Oct 16 02:13:17 2004
-@@ -153,7 +153,7 @@
- config -> deleteEntry ("Properties Dialog Page");
- else
- config -> writeEntry ("Properties Dialog Page", name);
-- setHelp (name.isEmpty() ? "properties" : "properties-" + name);
-+ setHelp (name.isEmpty() ? QString::fromLatin1("properties") : "properties-" + name);
- }
-
- void KPlayerPropertiesDialog::slotOk (void)
-@@ -191,8 +191,8 @@
- c_name -> setText (m_properties -> name());
- c_playlist -> setCurrentItem (m_properties -> playlistOption());
- c_length -> setText (timeString (m_properties -> length()));
-- c_original_width -> setText (m_properties -> originalSize().isEmpty() ? "" : QString::number (m_properties -> originalSize().width()));
-- c_original_height -> setText (m_properties -> originalSize().isEmpty() ? "" : QString::number (m_properties -> originalSize().height()));
-+ c_original_width -> setText (m_properties -> originalSize().isEmpty() ? QString::fromLatin1("") : QString::number (m_properties -> originalSize().width()));
-+ c_original_height -> setText (m_properties -> originalSize().isEmpty() ? QString::fromLatin1("") : QString::number (m_properties -> originalSize().height()));
- c_display_size -> setCurrentItem (m_properties -> displaySizeOption());
- displaySizeChanged (c_display_size -> currentItem());
- c_maintain_aspect -> setCurrentItem (m_properties -> maintainAspectOption() + 1);
-@@ -266,7 +266,7 @@
-
- void KPlayerPropertiesSubtitles::autoloadChanged (int option)
- {
-- c_url -> setText (option < 2 || m_properties -> subtitleUrl().isEmpty() ? ""
-+ c_url -> setText (option < 2 || m_properties -> subtitleUrl().isEmpty() ? QString::fromLatin1("")
- : m_properties -> subtitleUrl().isLocalFile() ? m_properties -> subtitleUrl().path()
- : m_properties -> subtitleUrl().url());
- c_url -> setEnabled (option == 2);
-@@ -274,7 +274,7 @@
-
- void KPlayerPropertiesSubtitles::positionChanged (int option)
- {
-- c_position -> setText (option > 0 ? QString::number (m_properties -> subtitlePositionValue()) : "");
-+ c_position -> setText (option > 0 ? QString::number (m_properties -> subtitlePositionValue()) : QString::fromLatin1(""));
- c_position -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -285,7 +285,7 @@
-
- void KPlayerPropertiesSubtitles::delayChanged (int option)
- {
-- c_delay -> setText (option > 0 ? QString::number (m_properties -> subtitleDelayValue()) : "");
-+ c_delay -> setText (option > 0 ? QString::number (m_properties -> subtitleDelayValue()) : QString::fromLatin1(""));
- c_delay -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -348,7 +348,7 @@
-
- void KPlayerPropertiesAudio::volumeChanged (int option)
- {
-- c_volume -> setText (option > 0 ? QString::number (m_properties -> volumeValue()) : "");
-+ c_volume -> setText (option > 0 ? QString::number (m_properties -> volumeValue()) : QString::fromLatin1(""));
- c_volume -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -359,7 +359,7 @@
-
- void KPlayerPropertiesAudio::delayChanged (int option)
- {
-- c_delay -> setText (option > 0 ? QString::number (m_properties -> audioDelayValue()) : "");
-+ c_delay -> setText (option > 0 ? QString::number (m_properties -> audioDelayValue()) : QString::fromLatin1(""));
- c_delay -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -441,7 +441,7 @@
-
- void KPlayerPropertiesVideo::contrastChanged (int option)
- {
-- c_contrast -> setText (option > 0 ? QString::number (m_properties -> contrastValue()) : "");
-+ c_contrast -> setText (option > 0 ? QString::number (m_properties -> contrastValue()) : QString::fromLatin1(""));
- c_contrast -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -452,7 +452,7 @@
-
- void KPlayerPropertiesVideo::brightnessChanged (int option)
- {
-- c_brightness -> setText (option > 0 ? QString::number (m_properties -> brightnessValue()) : "");
-+ c_brightness -> setText (option > 0 ? QString::number (m_properties -> brightnessValue()) : QString::fromLatin1(""));
- c_brightness -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -463,7 +463,7 @@
-
- void KPlayerPropertiesVideo::hueChanged (int option)
- {
-- c_hue -> setText (option > 0 ? QString::number (m_properties -> hueValue()) : "");
-+ c_hue -> setText (option > 0 ? QString::number (m_properties -> hueValue()) : QString::fromLatin1(""));
- c_hue -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -474,7 +474,7 @@
-
- void KPlayerPropertiesVideo::saturationChanged (int option)
- {
-- c_saturation -> setText (option > 0 ? QString::number (m_properties -> saturationValue()) : "");
-+ c_saturation -> setText (option > 0 ? QString::number (m_properties -> saturationValue()) : QString::fromLatin1(""));
- c_saturation -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
-@@ -524,7 +524,7 @@
-
- void KPlayerPropertiesAdvanced::commandLineChanged (int option)
- {
-- c_command_line -> setText (option > 0 ? m_properties -> commandLineValue() : "");
-+ c_command_line -> setText (option > 0 ? m_properties -> commandLineValue() : QString::fromLatin1(""));
- c_command_line -> setEnabled (option > 0);
- if ( option > 0 && sender() )
- {
diff -ruN kplayer/files/patch-kplayersettings.h kplayer.new/files/patch-kplayersettings.h
--- kplayer/files/patch-kplayersettings.h 2004-10-16 15:10:34.000000000 +0700
+++ kplayer.new/files/patch-kplayersettings.h 1970-01-01 07:00:00.000000000 +0700
@@ -1,11 +0,0 @@
---- kplayer/kplayersettings.h.orig Sat Oct 16 02:00:48 2004
-+++ kplayer/kplayersettings.h Sat Oct 16 02:01:22 2004
-@@ -982,7 +982,7 @@
- }
-
- QString executablePathDefault (void) const
-- { return m_executable_path_default.isEmpty() ? "mplayer" : m_executable_path_default; }
-+ { return m_executable_path_default.isEmpty() ? QString::fromLatin1("mplayer") : m_executable_path_default; }
- void setExecutablePathDefault (QString path)
- { m_executable_path_default = path; }
-
diff -ruN kplayer/files/patch-kplayersettingsdialog.cpp kplayer.new/files/patch-kplayersettingsdialog.cpp
--- kplayer/files/patch-kplayersettingsdialog.cpp 2004-10-16 15:10:34.000000000 +0700
+++ kplayer.new/files/patch-kplayersettingsdialog.cpp 1970-01-01 07:00:00.000000000 +0700
@@ -1,29 +0,0 @@
---- kplayer/kplayersettingsdialog.cpp.orig Sat Oct 16 02:16:39 2004
-+++ kplayer/kplayersettingsdialog.cpp Sat Oct 16 02:17:35 2004
-@@ -271,7 +271,7 @@
- config -> deleteEntry ("Settings Dialog Page");
- else
- config -> writeEntry ("Settings Dialog Page", name);
-- setHelp (name.isEmpty() ? "settings" : "settings-" + name);
-+ setHelp (name.isEmpty() ? QString::fromLatin1("settings") : "settings-" + name);
- }
-
- void KPlayerSettingsDialog::slotOk (void)
-@@ -435,7 +435,7 @@
- KPlayerSettings* settings = kPlayerSettings();
- c_driver_fallback -> setChecked (index > 0 && settings -> audioDriverFallbackDefault());
- c_driver_fallback -> setEnabled (index > 0);
-- c_device -> setText (index > 0 ? settings -> audioDeviceDefault() : "");
-+ c_device -> setText (index > 0 ? settings -> audioDeviceDefault() : QString::fromLatin1(""));
- c_device -> setEnabled (index > 0);
- }
-
-@@ -792,7 +792,7 @@
- KPlayerSettings* settings = kPlayerSettings();
- c_driver_fallback -> setChecked (index > 0 && settings -> videoDriverFallbackDefault());
- c_driver_fallback -> setEnabled (index > 0);
-- c_device -> setText (index > 0 ? settings -> videoDeviceDefault() : "");
-+ c_device -> setText (index > 0 ? settings -> videoDeviceDefault() : QString::fromLatin1(""));
- c_device -> setEnabled (index > 0);
- }
-
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801231842.m0NIg7F3068389>