[avidemux] Add patch to fix qt gui issues, fixes BZ#4035.
by Richard Shaw
commit 9e18b0ebe44191a5d87174f6eb27fa3a286fb47b
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Mon Jul 25 09:51:34 2016 -0500
Add patch to fix qt gui issues, fixes BZ#4035.
avidemux-2.6.12-qt.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
avidemux.spec | 11 +++++--
2 files changed, 82 insertions(+), 3 deletions(-)
---
diff --git a/avidemux-2.6.12-qt.patch b/avidemux-2.6.12-qt.patch
new file mode 100644
index 0000000..51709cb
--- /dev/null
+++ b/avidemux-2.6.12-qt.patch
@@ -0,0 +1,74 @@
+From 4cb0b19d7b78620d43d0a2ece821111246b81939 Mon Sep 17 00:00:00 2001
+From: mean <fixounet(a)free.fr>
+Date: Thu, 31 Mar 2016 21:50:09 +0200
+Subject: [PATCH] [UI] Cosmetic, use a define rather than hardcoded value
+
+---
+ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp
+index 70d8227..1b4d770 100644
+--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp
++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp
+@@ -43,7 +43,8 @@
+ using namespace std;
+
+ #define ADM_SLIDER_REFRESH_PERIOD 500
+-
++#define ADM_LARGE_SCALE 1000000000LL
++#define ADM_SCALE_INCREMENT (ADM_LARGE_SCALE/100LL)
+
+ #if defined(USE_SDL) && ( !defined(_WIN32) && !defined(__APPLE__))
+ #define SDL_ON_LINUX
+@@ -328,9 +329,9 @@ MainWindow::MainWindow(const vector<IScriptEngine*>& scriptEngines) : _scriptEng
+ // Slider
+ slider=ui.horizontalSlider;
+ slider->setMinimum(0);
+- slider->setMaximum(1000000000);
++ slider->setMaximum(ADM_LARGE_SCALE);
+ #if 1
+- slider->setTickInterval(10000000);
++ slider->setTickInterval(ADM_SCALE_INCREMENT);
+ slider->setTickPosition(QSlider::TicksBothSides);
+ #endif
+ connect( slider,SIGNAL(valueChanged(int)),this,SLOT(sliderValueChanged(int)));
+@@ -1053,14 +1054,14 @@ double UI_readScale( void )
+ double v;
+ if(!slider) v=0;
+ v= (double)(slider->value());
+- v/=10000000;
++ v/=ADM_SCALE_INCREMENT;
+ return v;
+ }
+ void UI_setScale( double val )
+ {
+ if(_upd_in_progres) return;
+ _upd_in_progres++;
+- slider->setValue( (int)(val * 10000000));
++ slider->setValue( (int)(val * ADM_SCALE_INCREMENT));
+ _upd_in_progres--;
+ }
+
+From 620b36c80a7a8baf2c08feee41ebfb0cdccefb0f Mon Sep 17 00:00:00 2001
+From: mean <fixounet(a)free.fr>
+Date: Fri, 1 Apr 2016 06:31:24 +0200
+Subject: [PATCH] [Qt] Reduce granularity of seek bar, it causes problems
+
+---
+ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp
+index 1b4d770..7a2f574 100644
+--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp
++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp
+@@ -43,7 +43,7 @@
+ using namespace std;
+
+ #define ADM_SLIDER_REFRESH_PERIOD 500
+-#define ADM_LARGE_SCALE 1000000000LL
++#define ADM_LARGE_SCALE (10LL*1000LL)
+ #define ADM_SCALE_INCREMENT (ADM_LARGE_SCALE/100LL)
+
+ #if defined(USE_SDL) && ( !defined(_WIN32) && !defined(__APPLE__))
diff --git a/avidemux.spec b/avidemux.spec
index 6ee6869..7d48fa9 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.6.12
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -15,6 +15,7 @@ Patch0: avidemux-2.6.10-bundled_libs.patch
Patch1: avidemux-2.6.10-qt5_lrelease.patch
Patch2: avidemux-2.6.12-narrowing.patch
Patch3: avidemux-2.6.12-gcc6.patch
+Patch4: avidemux-2.6.12-qt.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -142,6 +143,7 @@ This package contains translation files for %{name}.
%patch1 -p1 -b .bund_libs
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -299,7 +301,7 @@ find %{buildroot}%{_libdir} -type f -name "*.so.*" -exec chmod 0755 {} \;
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
-#%postun gtk
+#postun gtk
#if [ $1 -eq 0 ] ; then
# /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
# /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -313,7 +315,7 @@ if [ $1 -eq 0 ] ; then
fi
/usr/bin/update-desktop-database &> /dev/null || :
-#%posttrans gtk
+#posttrans gtk
#/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%posttrans qt
@@ -370,6 +372,9 @@ fi
%changelog
+* Mon Jul 25 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.12-4
+- Add patch to fix qt gui issues, fixes BZ#4035.
+
* Mon Jul 11 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.6.12-3
- Really fix building with GCC6, patch provided by Dan Horák <dan(a)danny.cz>
7 years, 9 months
[kodi-platform] First import
by Mohamed ElMorabity
commit 57b9a72bd9d01acc51013170fd9f04464eb06127
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Fri Jul 22 22:48:26 2016 +0200
First import
.gitignore | 1 +
gpl-2.0.txt | 339 +++++++++++++++++++++++++++++++++++
kodi-platform-15.0-install.patch | 12 ++
kodi-platform-16.0-p8_platform.patch | 24 +++
kodi-platform.spec | 92 ++++++++++
sources | 1 +
6 files changed, 469 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..66ecf07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/kodi-platform-15edaf7.tar.gz
diff --git a/gpl-2.0.txt b/gpl-2.0.txt
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/gpl-2.0.txt
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/kodi-platform-15.0-install.patch b/kodi-platform-15.0-install.patch
new file mode 100644
index 0000000..160c714
--- /dev/null
+++ b/kodi-platform-15.0-install.patch
@@ -0,0 +1,12 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig 2015-05-04 12:32:24.000000000 +0200
++++ ./CMakeLists.txt 2015-07-19 05:39:38.910280201 +0200
+@@ -64,7 +64,7 @@ ENDIF(NOT WIN32)
+ configure_file (kodiplatform-config.cmake.in
+ kodiplatform-config.cmake @ONLY)
+ install(FILES ${CMAKE_BINARY_DIR}/kodiplatform-config.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/kodiplatform)
++ DESTINATION ${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME})
+
+ # Quell warnings with in-tree builds
+ set(KODI_BUILD_DIR ${KODI_BUILD_DIR})
diff --git a/kodi-platform-16.0-p8_platform.patch b/kodi-platform-16.0-p8_platform.patch
new file mode 100644
index 0000000..5230a32
--- /dev/null
+++ b/kodi-platform-16.0-p8_platform.patch
@@ -0,0 +1,24 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig 2015-08-05 09:01:57.000000000 +0200
++++ ./CMakeLists.txt 2016-07-22 22:40:46.943554980 +0200
+@@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ find_package(kodi REQUIRED)
+ find_package(TinyXML REQUIRED)
+ find_package(Threads REQUIRED)
+-find_package(platform REQUIRED)
++find_package(p8-platform REQUIRED)
+ include(UseMultiArch.cmake)
+ include(CheckAtomic.cmake)
+
+diff -up ./src/util/XMLUtils.h.orig ./src/util/XMLUtils.h
+--- ./src/util/XMLUtils.h.orig 2015-08-05 09:01:57.000000000 +0200
++++ ./src/util/XMLUtils.h 2016-07-22 22:41:13.395521520 +0200
+@@ -21,7 +21,7 @@
+ *
+ */
+
+-#include <platform/util/StdString.h>
++#include <p8-platform/util/StdString.h>
+ #include "tinyxml.h"
+
+ class XMLUtils
diff --git a/kodi-platform.spec b/kodi-platform.spec
new file mode 100644
index 0000000..574e3b3
--- /dev/null
+++ b/kodi-platform.spec
@@ -0,0 +1,92 @@
+# Upstream kodi hardcodes a Git hash for OSes that bundle kodi-platform. Let's
+# try using the same hash that upstream uses for the current Kodi version
+# available in RPMFusion. It can be found in the Kodi source tree like so:
+# project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
+%global commit 15edaf78d6307eaa5e1d17028122d8bce9d55aa2
+%global short_commit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20150805
+
+Name: kodi-platform
+Version: 16.0
+Release: 0.1.%{commit_date}git%{short_commit}%{?dist}
+Summary: Kodi platform support library
+
+Group: System Environment/Libraries
+License: GPLv2+
+URL: https://github.com/xbmc/kodi-platform/
+Source0: https://github.com/xbmc/%{name}/archive/%{short_commit}/%{name}-%{short_c...
+# GPLv2 license file
+Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+# Fix .cmake files installation path
+Patch0: %{name}-15.0-install.patch
+# Fix p8-platform library detection
+Patch1: %{name}-16.0-p8_platform.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: kodi-devel >= %{version}
+BuildRequires: platform-devel
+BuildRequires: tinyxml-devel
+
+%description
+%{summary}.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: cmake
+Requires: kodi-devel%{?_isa} >= %{version}
+Requires: platform-devel%{?_isa}
+Requires: tinyxml-devel%{?_isa}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q -n %{name}-%{commit}
+%patch0 -p0 -b .install
+%patch1 -p0 -b .p8_platform
+
+cp %{SOURCE1} .
+
+
+%build
+%cmake .
+%make_build
+
+
+%install
+%make_install
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%license gpl-2.0.txt
+%{_libdir}/*.so.*
+
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/cmake/kodiplatform/
+%{_libdir}/pkgconfig/*.pc
+
+
+%changelog
+* Fri Jul 22 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 16.0-0.1.20150805git15edaf7
+- Sync with Kodi 16.0
+
+* Mon Aug 24 2015 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 15.0-0.2.20150504git054a42f
+- Add license file
+
+* Mon Jul 20 2015 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 15.0-0.1.20150504git054a42f
+- Initial RPM release
diff --git a/sources b/sources
index e69de29..c5d3608 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+82ccaba3328b440e659625addb18f008 kodi-platform-15edaf7.tar.gz
7 years, 9 months
[mpd] Update to latest upstream release 0.19.17
by Ankur Sinha
commit 7d6b98ed7e150fcc62a10c3b2e7ffca3785c651a
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Jul 25 10:15:09 2016 +0100
Update to latest upstream release 0.19.17
.gitignore | 1 +
mpd-0.19.14.tar.xz.sig | Bin 543 -> 0 bytes
mpd-0.19.17.tar.xz.sig | Bin 0 -> 543 bytes
mpd.spec | 10 +++++++++-
sources | 2 +-
5 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5843152..4af8abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mpd-0.19.14.tar.xz
+/mpd-0.19.17.tar.xz
diff --git a/mpd-0.19.17.tar.xz.sig b/mpd-0.19.17.tar.xz.sig
new file mode 100644
index 0000000..4247b01
Binary files /dev/null and b/mpd-0.19.17.tar.xz.sig differ
diff --git a/mpd.spec b/mpd.spec
index 7e3fbe1..b6c6e81 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -16,7 +16,7 @@
Name: mpd
Epoch: 1
-Version: 0.19.16
+Version: 0.19.17
Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
@@ -69,6 +69,7 @@ BuildRequires: wavpack-devel
BuildRequires: yajl-devel
BuildRequires: zlib-devel
BuildRequires: zziplib-devel
+BuildRequires: libsidplayfp-devel
Requires(pre): shadow-utils
Requires(post): systemd
@@ -98,6 +99,8 @@ browsing and playing your MPD music collection.
--enable-mikmod \
--enable-pipe-output \
--disable-mpc \
+ --enable-sidplay \
+ --enable-systemd-daemon \
--enable-zzip \
--enable-soxr
make %{?_smp_mflags}
@@ -176,6 +179,11 @@ fi
%changelog
+* Mon Jul 25 2016 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.19.17-1
+- Update to latest upstream release
+- Enable sidplay
+- Attempt to enable systemd daemon usage
+
* Tue Jun 21 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.19.16-1
- Update to 1.19.16
diff --git a/sources b/sources
index ed3eae4..faf5e61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-337f8d76ed530cf9a9f38eb35881eb9f mpd-0.19.16.tar.xz
+47e13f3f160bf94e7a897c5a48990f3d mpd-0.19.17.tar.xz
7 years, 9 months
[lxdream] Fix another "relocation R_X86_64_PC32 against undefined symbol recompile with
by Sérgio M. Basto
commit b7d31f5b6c1fb4d87f5ed541a2d5bcd4e88707a9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jul 25 06:03:17 2016 +0100
Fix another "relocation R_X86_64_PC32 against undefined symbol recompile with
-fPIC"
lxdream-0.9.1-implicit.patch | 21 +++++++++++++++++++++
lxdream.spec | 7 ++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/lxdream-0.9.1-implicit.patch b/lxdream-0.9.1-implicit.patch
index 4c658f9..910d04e 100644
--- a/lxdream-0.9.1-implicit.patch
+++ b/lxdream-0.9.1-implicit.patch
@@ -1,6 +1,27 @@
+Fix "relocation R_X86_64_PC32 against undefined symbol `uncompress' can not be used
+ when making a shared object; recompile with -fPIC" by not overwrite CFLAGS.
diff -up lxdream-0.9.1/configure.implicit lxdream-0.9.1/configure
--- lxdream-0.9.1/configure.implicit 2009-06-28 12:29:06.000000000 +0200
+++ lxdream-0.9.1/configure 2012-02-11 00:21:17.719647658 +0100
+@@ -7780,15 +7780,15 @@ _ACEOF
+
+ fi
+
+-CFLAGS="-g -fexceptions"
+-OBJCFLAGS="-g -fexceptions"
++CFLAGS+=" -g -fexceptions"
++OBJCFLAGS+=" -g -fexceptions"
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_EXCEPTIONS 1
+ _ACEOF
+
+
+-STDCFLAG="-std=c99"
++STDCFLAG+=" -std=c99"
+
+ _GCC_VERSION=`$CC --version | $SED -ne '/gcc/p'`
+ _ICC_VERSION=`$CC --version | $SED -ne '/(ICC)/p'`
@@ -9116,6 +9116,8 @@ _ACEOF
fi
diff --git a/lxdream.spec b/lxdream.spec
index 4810b82..c8e385b 100644
--- a/lxdream.spec
+++ b/lxdream.spec
@@ -1,6 +1,6 @@
Name: lxdream
Version: 0.9.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Sega Dreamcast emulator
License: GPLv2+
URL: http://www.lxdream.org
@@ -17,6 +17,7 @@ BuildRequires: lirc-devel
BuildRequires: perl(Pod::Man)
BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
+BuildRequires: zlib-devel
# there should be a {ix86} instead of i386 in the ExclusiveArch line but
# that would make plague build the package for athlon, i386, i586 and i686 :-/
ExclusiveArch: i686 x86_64
@@ -65,6 +66,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/lxdream.desktop
%changelog
+* Mon Jul 25 2016 Sérgio Basto <sergio(a)serjux.com> - 0.9.1-10
+- Fix another "relocation R_X86_64_PC32 against undefined symbol recompile with
+ -fPIC"
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.9.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
7 years, 9 months
[xine-lib] Fix build with libxcb-1.12, https://bugs.xine-project.org/show_bug.cgi?id=573
by Sérgio M. Basto
commit 48b3b7fa99b117c0d146cd64066387c3ce29c401
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jul 25 04:41:16 2016 +0100
Fix build with libxcb-1.12, https://bugs.xine-project.org/show_bug.cgi?id=573
xine-lib-link-xcb.patch | 36 ++++++++++++++++++++++++++++++++++++
xine-lib.spec | 9 ++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib-link-xcb.patch b/xine-lib-link-xcb.patch
new file mode 100644
index 0000000..af6d058
--- /dev/null
+++ b/xine-lib-link-xcb.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Dominique Leuenberger <dimstar(a)opensuse.org>
+# Date 1468914700 -7200
+# Tue Jul 19 09:51:40 2016 +0200
+# Node ID 434e1ff5323789560c210b0b417844b8ab232ab0
+# Parent 24fc93301077a2317d1d6deda3b7d895e6754e26
+build: Fix linking with new xcb versions
+
+As we make use of specific xcb and xcb_shm functions, it is our sole responsibility
+to ensure we link against the right libs. Expecting xcb-shape to bring in all the
+dependencies for us is wrong (and no longer works in all cases)
+
+diff -r 24fc93301077 -r 434e1ff53237 m4/video_out.m4
+--- a/m4/video_out.m4 Tue Jun 07 19:33:35 2016 +0200
++++ b/m4/video_out.m4 Tue Jul 19 09:51:40 2016 +0200
+@@ -305,7 +305,7 @@
+ dnl xcb
+ XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
+ if test x"$with_xcb" != x"no"; then
+- PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
++ PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
+ if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then
+ AC_MSG_ERROR([XCB support requested, but XCB not found])
+ elif test x"$have_xcb" = x"yes"; then
+diff -r 24fc93301077 -r 434e1ff53237 src/video_out/Makefile.am
+--- a/src/video_out/Makefile.am Tue Jun 07 19:33:35 2016 +0200
++++ b/src/video_out/Makefile.am Tue Jul 19 09:51:40 2016 +0200
+@@ -147,7 +147,7 @@
+ xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
+
+ xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
+-xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
++xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS)
+ xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
+
+ xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
diff --git a/xine-lib.spec b/xine-lib.spec
index 59fe82f..db2d495 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -10,7 +10,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.6
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
@@ -18,6 +18,7 @@ Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
# http://bugzilla.redhat.com/477226
Patch1: xine-lib-1.1.16.2-multilib.patch
Patch2: ffmpeg_2.9.patch
+Patch3: xine-lib-link-xcb.patch
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -76,6 +77,7 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(libpulse)
BuildRequires: gtk2-devel
BuildRequires: libsmbclient-devel
+BuildRequires: libtool
%description
@@ -109,6 +111,8 @@ This package contains extra plugins for %{name}:
%setup -q
%patch1 -p1 -b .multilib
%patch2 -p1 -b .ffmpeg_2.9
+%patch3 -p1 -b .xcb
+autoreconf -i
%build
@@ -330,6 +334,9 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%changelog
+* Mon Jul 25 2016 Sérgio Basto <sergio(a)serjux.com> - 1.2.6-12
+- Fix build with libxcb-1.12, https://bugs.xine-project.org/show_bug.cgi?id=573
+
* Fri Jul 08 2016 Sérgio Basto <sergio(a)serjux.com> - 1.2.6-11
- Build again with vcd support
7 years, 9 months
[xmltv/f23] Update xmltv to 0.5.68
by Sérgio M. Basto
Summary of changes:
a6a830f... Update xmltv to 0.5.68 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 9 months