Overview

Request 237 (accepted)

- Update to version 0.5.6, no major changes
but drops ffmpeg patch included in release.

Submit package home:crrodriguez:branches:Multimedia / qmmp to package Multimedia / qmmp
View file
qmmp.changes Changed
​x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Wed Jun 27 17:54:17 UTC 2012 - crrodriguez@opensuse.org
4
+
5
+- Update to version 0.5.6, no major changes
6
+  but drops ffmpeg patch included in release.
7
+
8
+-------------------------------------------------------------------
9
 Thu May 31 20:12:40 UTC 2012 - crrodriguez@opensuse.org
10
11
 - Fix previous change, that broke build in old distros.
12
​
View file
qmmp.spec Changed
38
 
1
@@ -1,7 +1,7 @@
2
 # norootforbuild
3
4
 Name:       qmmp
5
-Version:    0.5.5
6
+Version:    0.5.6
7
 Release:    1
8
9
 Summary:    Qt-based multimedia player
10
@@ -10,7 +10,6 @@
11
 Group:      Productivity/Multimedia/Sound/Players
12
13
 Source0:    %{name}-%{version}.tar.bz2
14
-Patch0:     qmmp-ffmpeg011.patch
15
16
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
17
18
@@ -65,7 +64,6 @@
19
20
 %prep
21
 %setup -q
22
-%patch0 -p1
23
24
 %build
25
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
26
@@ -101,9 +99,9 @@
27
 %doc AUTHORS COPYING ChangeLog ChangeLog.svn README
28
 %{_bindir}/%{name}
29
 %{_libdir}/lib%{name}.so.0
30
-%{_libdir}/lib%{name}.so.0.5.5
31
+%{_libdir}/lib%{name}.so.0.5.6
32
 %{_libdir}/lib%{name}ui.so.0
33
-%{_libdir}/lib%{name}ui.so.0.5.5
34
+%{_libdir}/lib%{name}ui.so.0.5.6
35
 %dir %{_libdir}/%{name}
36
 %dir %{_libdir}/%{name}/CommandLineOptions
37
 %{_libdir}/%{name}/CommandLineOptions/libincdecvolumeoption.so
38
​
View file
qmmp-ffmpeg011.patch Deleted
28
 
1
@@ -1,26 +0,0 @@
2
-diff -ur qmmp-0.5.5.orig/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp qmmp-0.5.5/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
3
---- qmmp-0.5.5.orig/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp    2012-01-27 13:22:30.000000000 +0100
4
-+++ qmmp-0.5.5/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp 2012-05-28 00:36:10.864007462 +0200
5
-@@ -133,9 +133,6 @@
6
-     m_stream->seekable = !input()->isSequential();
7
-     m_stream->max_packet_size = INPUT_BUFFER_SIZE;
8
-
9
--    AVFormatParameters ap;
10
--    memset(&ap, 0, sizeof(ap));
11
--
12
-     if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0)
13
-     {
14
-         qDebug("DecoderFFmpeg: av_open_input_stream() failed");
15
-@@ -501,10 +498,8 @@
16
- #endif
17
-     m_stream->max_packet_size = INPUT_BUFFER_SIZE;
18
-
19
--    AVFormatParameters ap;
20
--    memset(&ap, 0, sizeof(ap));
21
--
22
--    if(av_open_input_stream(&ic, m_stream, m_path.toLocal8Bit(), fmt, &ap) != 0)
23
-+    ic->pb = m_stream;
24
-+    if(avformat_open_input(&ic, m_path.toLocal8Bit(), fmt, NULL) != 0)
25
-     {
26
-         qDebug("DecoderFFmpeg: av_open_input_stream() failed");
27
-         return false;
28
​
View file
qmmp-0.5.5.tar.bz2/CMakeLists.txt -> qmmp-0.5.6.tar.bz2/CMakeLists.txt Changed
23
 
1
@@ -1,6 +1,12 @@
2
 cmake_minimum_required(VERSION 2.6.0)
3
4
+#freebsd support
5
 include_directories(/usr/local/include)
6
+link_directories(/usr/local/lib)
7
+link_directories(/usr/local/lib32)
8
+link_directories(/usr/local/lib64)
9
+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
10
+
11
12
 CONFIGURE_FILE(
13
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
14
@@ -10,7 +16,7 @@
15
 ADD_CUSTOM_TARGET(uninstall
16
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
17
18
-SET(QMMP_VERSION 0.5.5)
19
+SET(QMMP_VERSION 0.5.6)
20
 SET(QMMP_SOVERSION 0)
21
 SET(SVN_VERSION FALSE)
22
23
​
View file
qmmp-0.5.5.tar.bz2/ChangeLog -> qmmp-0.5.6.tar.bz2/ChangeLog Changed
9
 
1
@@ -595,3 +595,7 @@
2
 * fixed some cuesheets parsing
3
 * fixed --pause command line option behavior (Jared Breland)
4
 * updated Japanese translation (Ryota Shimamoto)
5
+
6
+Version 0.5.6
7
+* added ffmpeg 0.11 support
8
+* fixed freebsd build
9
​
View file
qmmp-0.5.5.tar.bz2/ChangeLog.rus -> qmmp-0.5.6.tar.bz2/ChangeLog.rus Changed
9
 
1
@@ -599,3 +599,7 @@
2
 * исправлена поддержка некоторых cue-файлов
3
 * исправлена обработка опции --pause из командной строки (Jared Breland)
4
 * обновлён японский перевод (Ryota Shimamoto)
5
+
6
+Версия 0.5.6
7
+* добавлена поддержка ffmpeg 0.11
8
+* исправлена сборка под freebsd
9
​
View file
qmmp-0.5.5.tar.bz2/ChangeLog.svn -> qmmp-0.5.6.tar.bz2/ChangeLog.svn Changed
26
 
1
@@ -1,4 +1,24 @@
2
 ------------------------------------------------------------------------
3
+r2742 | trialuser02 | 2012-05-30 21:25:39 +0400 (Срд, 30 Май 2012) | 1 line
4
+
5
+fixed oss4 includes
6
+------------------------------------------------------------------------
7
+r2741 | trialuser02 | 2012-05-30 00:16:32 +0400 (Срд, 30 Май 2012) | 1 line
8
+
9
+fixed freebsd support
10
+------------------------------------------------------------------------
11
+r2735 | trialuser02 | 2012-05-27 20:44:49 +0400 (Вск, 27 Май 2012) | 1 line
12
+
13
+updated changelog
14
+------------------------------------------------------------------------
15
+r2729 | trialuser02 | 2012-05-26 12:18:17 +0400 (Сбт, 26 Май 2012) | 1 line
16
+
17
+added ffmpeg 0.11 support
18
+------------------------------------------------------------------------
19
+r2728 | trialuser02 | 2012-05-26 12:17:03 +0400 (Сбт, 26 Май 2012) | 1 line
20
+
21
+version bump
22
+------------------------------------------------------------------------
23
 r2724 | trialuser02 | 2012-05-25 15:02:18 +0400 (Птн, 25 Май 2012) | 1 line
24
25
 updated linguist files
26
​
View file
qmmp-0.5.5.tar.bz2/qmmp.pri -> qmmp-0.5.6.tar.bz2/qmmp.pri Changed
10
 
1
@@ -7,7 +7,7 @@
2
3
 #Version
4
5
-QMMP_VERSION = 0.5.5
6
+QMMP_VERSION = 0.5.6
7
 #CONFIG += SVN_VERSION
8
9
10
​
View file
qmmp-0.5.5.tar.bz2/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp -> qmmp-0.5.6.tar.bz2/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp Changed
11
 
1
@@ -133,9 +133,6 @@
2
     m_stream->seekable = !input()->isSequential();
3
     m_stream->max_packet_size = INPUT_BUFFER_SIZE;
4
5
-    AVFormatParameters ap;
6
-    memset(&ap, 0, sizeof(ap));
7
-
8
     if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0)
9
     {
10
         qDebug("DecoderFFmpeg: av_open_input_stream() failed");
11
​
View file
qmmp-0.5.5.tar.bz2/src/plugins/Output/oss4/CMakeLists.txt -> qmmp-0.5.6.tar.bz2/src/plugins/Output/oss4/CMakeLists.txt Changed
22
 
1
@@ -24,7 +24,7 @@
2
   ${CMAKE_CURRENT_SOURCE_DIR}/../../../
3
 )
4
 #oss4
5
-include_directories(/usr/lib/oss/include)
6
+include_directories(/usr/lib/oss/include /usr/local/lib/oss/include)
7
 CHECK_INCLUDE_FILE(sys/soundcard.h SYS_SOUNDCARD_H_FOUND)
8
 IF(SYS_SOUNDCARD_H_FOUND)
9
 ADD_DEFINITIONS(-DHAVE_SYS_SOUNDCARD_H)
10
@@ -32,7 +32,10 @@
11
 ENDIF(SYS_SOUNDCARD_H_FOUND)
12
13
14
-SET(CMAKE_REQUIRED_INCLUDES /usr/lib/oss/include/ /usr/include/)
15
+SET(CMAKE_REQUIRED_INCLUDES
16
+   /usr/lib/oss/include/
17
+   /usr/local/lib/oss/include
18
+   ${CMAKE_REQUIRED_INCLUDES})
19
20
 CHECK_CXX_SOURCE_COMPILES("
21
 #include <unistd.h>
22
​
Refresh
Refresh
Request History
crrodriguez's avatar

crrodriguez created request over 11 years ago

- Update to version 0.5.6, no major changes
but drops ffmpeg patch included in release.

crrodriguez's avatar

crrodriguez accepted request almost 13 years ago

Locations
Help
Contact