ports/109224: multimedia/kplayer update to latest version
Rashid N. Achilov
achilov-rn at askd.ru
Fri Feb 16 11:00:13 UTC 2007
>Number: 109224
>Category: ports
>Synopsis: multimedia/kplayer update to latest version
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 16 11:00:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Rashid N. Achilov
>Release: 6.2-RELEASE
>Organization:
LLC "AS-System Complex"
>Environment:
>Description:
port multimedia/kplayer has a new version. This patch updates port to reflect latest changes
>How-To-Repeat:
Try to install multimedia/kplayer and get KPlayer 0.5.3, in spite of presence 0.6.0 on SF
>Fix:
Patch attached with submission follows:
diff -ruN kplayer/Makefile kplayer.new/Makefile
--- kplayer/Makefile Thu Feb 23 16:38:07 2006
+++ kplayer.new/Makefile Thu Feb 15 19:14:06 2007
@@ -6,7 +6,7 @@
#
PORTNAME= kplayer
-PORTVERSION= 0.5.3
+PORTVERSION= 0.6.0
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,6 +21,9 @@
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15 automake:19
+
+pre-configure:
+ (cd ${WRKSRC} && ${MAKE} -f ${WRKSRC}/Makefile.dist);
.include <bsd.port.mk>
diff -ruN kplayer/distinfo kplayer.new/distinfo
--- kplayer/distinfo Mon Jan 23 03:19:38 2006
+++ kplayer.new/distinfo Thu Feb 15 18:10:46 2007
@@ -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.0.tar.bz2) = c04b7a2a8c5d169d6c7c9c445da7c837
+SHA256 (kplayer-0.6.0.tar.bz2) = 554bcc585062b00f5723bdc0483d98921bdec6fd7cb3079192a7f31d95086c82
+SIZE (kplayer-0.6.0.tar.bz2) = 4219484
diff -ruN kplayer/files/patch-kplayerproperties.h kplayer.new/files/patch-kplayerproperties.h
--- kplayer/files/patch-kplayerproperties.h Sat Oct 16 15:10:34 2004
+++ kplayer.new/files/patch-kplayerproperties.h Thu Jan 1 07:00:00 1970
@@ -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 Sat Oct 16 15:10:34 2004
+++ kplayer.new/files/patch-kplayerpropertiesdialog.cpp Thu Jan 1 07:00:00 1970
@@ -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 Sat Oct 16 15:10:34 2004
+++ kplayer.new/files/patch-kplayersettings.h Thu Jan 1 07:00:00 1970
@@ -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 Sat Oct 16 15:10:34 2004
+++ kplayer.new/files/patch-kplayersettingsdialog.cpp Thu Jan 1 07:00:00 1970
@@ -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);
- }
-
diff -ruN kplayer/pkg-plist kplayer.new/pkg-plist
--- kplayer/pkg-plist Sat Sep 9 06:50:46 2006
+++ kplayer.new/pkg-plist Thu Feb 15 19:16:17 2007
@@ -1,7 +1,4 @@
bin/kplayer
-lib/kde3/kfile_kplayer.a
-lib/kde3/kfile_kplayer.la
-lib/kde3/kfile_kplayer.so
lib/kde3/libkplayerpart.a
lib/kde3/libkplayerpart.la
lib/kde3/libkplayerpart.so
@@ -237,7 +234,6 @@
share/locale/ru/LC_MESSAGES/kplayer.mo
share/locale/sv/LC_MESSAGES/kplayer.mo
share/locale/zh_CN/LC_MESSAGES/kplayer.mo
-share/services/kfile_kplayer.desktop
share/services/kplayerpart.desktop
@dirrmtry lib/kde3
@dirrmtry share/services
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list