September 2012 - rpmfusion-commits

rpms/qtractor/devel dead.package, NONE, 1.1 .cvsignore, 1.14, NONE qtractor.spec, 1.19, NONE sources, 1.14, NONE

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/qtractor/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20000/devel Added Files: dead.package Removed Files: .cvsignore qtractor.spec sources Log Message: Dead.package --- NEW FILE dead.package --- #Orphaned - splitted into a fedora and -freeworld version --- .cvsignore DELETED --- --- qtractor.spec DELETED --- --- sources DELETED ---

11 years, 7 months

1
0
0 / 0

rpms/qtractor/F-18 dead.package, NONE, 1.1 .cvsignore, 1.14, NONE qtractor.spec, 1.19, NONE sources, 1.14, NONE

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/qtractor/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20000/F-18 Added Files: dead.package Removed Files: .cvsignore qtractor.spec sources Log Message: Dead.package --- NEW FILE dead.package --- #Orphaned - splitted into a fedora and -freeworld version --- .cvsignore DELETED --- --- qtractor.spec DELETED --- --- sources DELETED ---

11 years, 7 months

1
0
0 / 0

rpms/VirtualBox/devel VirtualBox.spec,1.17,1.18

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12372 Modified Files: VirtualBox.spec Log Message: * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.3.RC3 - fix requires kmod, with version with prerealeses. Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- VirtualBox.spec 3 Sep 2012 03:30:26 -0000 1.17 +++ VirtualBox.spec 3 Sep 2012 05:29:09 -0000 1.18 @@ -15,7 +15,7 @@ Name: VirtualBox Version: 4.2.0 -Release: 0.2%{?prerel:.%{prerel}}%{?dist} +Release: 0.3%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -94,10 +94,10 @@ Provides: %{name}-OSE = %{version}-%{release} Obsoletes: %{name}-OSE < %{version}-%{release} -Requires: %{name}-kmod = %{version}%{?prereltag} -Provides: %{name}-kmod-common = %{version}%{?prereltag} -Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} -Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} +Requires: %{name}-kmod = %{version} +Provides: %{name}-kmod-common = %{version}-%{release} +Provides: %{name}-OSE-kmod-common = %{version}-%{release} +Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release} Conflicts: %{name}-guest <= %{version}-%{release} %description @@ -134,9 +134,9 @@ Provides: %{name}-OSE-guest = %{version}-%{release} Obsoletes: %{name}-OSE-guest < %{version}-%{release} Requires: %{name}-kmod = %{version} -Provides: %{name}-kmod-common = %{version} -Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} -Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} +Provides: %{name}-kmod-common = %{version}-%{release} +Provides: %{name}-OSE-kmod-common = %{version}-%{release} +Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release} Requires: xorg-x11-server-Xorg Requires: xorg-x11-xinit Provides: xorg-x11-drv-VirtualBox = %{version}-%{release} @@ -550,6 +550,9 @@ %changelog +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.3.RC3 +- fix requires kmod, with version with prerealeses. + * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC3 - vim :retab, reformat all tabs. - add BR # libstdc++.i686 and libc-devel.i686 for 32-bits

11 years, 7 months

1
0
0 / 0

rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.5,1.6

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9441 Modified Files: VirtualBox-kmod.spec Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3 - New RC major upstream release. Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- VirtualBox-kmod.spec 21 Jun 2012 03:23:49 -0000 1.5 +++ VirtualBox-kmod.spec 3 Sep 2012 04:24:52 -0000 1.6 @@ -9,7 +9,7 @@ # major version number, while the kernel module abi is not guarranteed # to be stable. This is so that we force the module update in sync with # userspace. -#global prerel beta3 +%global prerel RC3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} # Allow only root to access vboxdrv regardless of the file mode @@ -17,8 +17,8 @@ %bcond_without hardening Name: VirtualBox-kmod -Version: 4.1.18 -Release: 1%{?dist} +Version: 4.2.0 +Release: 0.1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -27,7 +27,7 @@ # This filters out the XEN kernel, since we don't run on XEN Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt -%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc = %{version}%{?prereltag}, xz, time +%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc = %{version}, xz, time BuildRequires: %{AkmodsBuildRequires} # needed for plague to make sure it builds for i586 and i686 @@ -96,6 +96,9 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3 +- New RC major upstream release. + * Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1 - New upstream release.

11 years, 7 months

1
0
0 / 0

rpms/qtractor-freeworld/F-17 qtractor-freeworld.spec, NONE, 1.1 qtractor-libmad-factorout.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Brendan Jones

Author: bsjones Update of /cvs/free/rpms/qtractor-freeworld/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9072/F-17 Modified Files: .cvsignore sources Added Files: qtractor-freeworld.spec qtractor-libmad-factorout.patch Log Message: Initial import --- NEW FILE qtractor-freeworld.spec --- %ifarch %{ix86} %global without_sse %{!?_without_sse:0}%{?_without_sse:1} %endif %ifarch ia64 x86_64 %global without_sse 0 %endif %ifnarch %{ix86} ia64 x86_64 %global without_sse 1 %endif Summary: Audio/MIDI multi-track sequencer Name: qtractor-freeworld Version: 0.5.5 Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://qtractor.sourceforge.net/ Source0: http://downloads.sourceforge.net/qtractor/qtractor-%{version}.tar.gz Patch1: qtractor-libmad-factorout.patch BuildRequires: libmad-devel BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libsndfile-devel BuildRequires: qt-devel BuildRequires: autoconf BuildRequires: automake Requires: qtractor%{?_isa} = %{version} Obsoletes: qtractor < 0.5.5 %description Qtractor is an Audio/MIDI multi-track sequencer application written in C++ around the Qt4 toolkit using Qt Designer. The initial target platform will be Linux, where the Jack Audio Connection Kit (JACK) for audio, and the Advanced Linux Sound Architecture (ALSA) for MIDI, are the main infrastructures to evolve as a fairly-featured Linux Desktop Audio Workstation GUI, specially dedicated to the personal home-studio. %prep %setup -q -n qtractor-%{version} %patch1 -p1 # Fix odd permissions chmod -x src/qtractorMmcEvent.* %build autoreconf export PATH=${PATH}:%{_libdir}/qt4/bin # remove support for everything except libmad as we are only # building the libmad plugin %configure \ --enable-liblo=no \ --enable-libmad=yes \ --enable-dssi=no \ --enable-vst=no \ --enable-slv2=no \ --enable-lv2=no \ --enable-ladspa=no \ --enable-libsndfile=no \ --enable-libsamplerate=no \ --enable-libvorbis=no \ --enable-librubberband=no \ %if %{without_sse} --enable-sse=no %endif make mad_plugin %{?_smp_mflags} %install rm -rf %{buildroot} install -m 755 -d %{buildroot}%{_libdir}/qtractor install -m 755 libqtractor_mad.so %{buildroot}%{_libdir}/qtractor %files %doc AUTHORS ChangeLog COPYING README TODO %{_libdir}/qtractor %changelog * Wed Aug 15 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-2 - Correct directory ownership * Tue Jun 19 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-1 - Initial package qtractor-libmad-factorout.patch: Makefile.in | 36 +++++++++++++++++++++++++++---- configure.ac | 24 ++++++++++++++++++++- qtractor_mad.pro | 9 +++++++ src/config.h.in | 6 +++++ src/mad.pri | 38 +++++++++++++++++++++++++++++++++ src/qtractorAudioFile.cpp | 49 ++++++++++++++++++++++++++++++++++++++----- src/qtractorAudioFile.h | 14 +++++++++++- src/qtractorAudioMadFile.cpp | 5 ++++ src/qtractorMainForm.cpp | 5 ++-- src/src.pri.in | 1 src/src.pro | 2 - 11 files changed, 173 insertions(+), 16 deletions(-) --- NEW FILE qtractor-libmad-factorout.patch --- diff -rupN qtractor-0.5.5.old/configure.ac qtractor-0.5.5/configure.ac --- qtractor-0.5.5.old/configure.ac 2012-06-15 06:12:54.000000000 -0400 +++ qtractor-0.5.5/configure.ac 2012-06-24 04:26:35.076671263 -0400 @@ -14,6 +14,22 @@ fi AC_SUBST(ac_prefix) AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.]) +# Set default installation libdir and plugindir. +if test "x$exec_prefix" = "xNONE"; then + exec_prefix="${ac_prefix}" +fi + +ac_libdir=$libdir +if test "x$ac_libdir" = "xNONE"; then + ac_libdir=$ac_default_libdir +fi +# We want to make sure that this expands out. Otherwise we have bash variables +# such as ${exec_prefix} inside config.h: +eval ac_libdir="\"$ac_libdir\"" +AC_SUBST(ac_libdir) +AC_DEFINE_UNQUOTED(CONFIG_LIBDIR, ["$ac_libdir"], [Default installation libdir.]) +AC_DEFINE_UNQUOTED(CONFIG_PLUGINDIR, ["$ac_libdir/qtractor"], [Default plugin installation dir.]) + # Enable debugging argument option. AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]), @@ -550,12 +566,14 @@ if test "x$ac_libmad" = "xyes"; then AC_CHECK_LIB(mad, main, [ac_libmad="yes"], [ac_libmad="no"]) if test "x$ac_libmad" = "xyes"; then AC_DEFINE(CONFIG_LIBMAD, 1, [Define if libmad is available.]) - ac_libs="$ac_libs -lmad" + ac_have_libmad=1 else AC_MSG_WARN([*** mad library not found.]) AC_MSG_WARN([*** MPEG Layer III audio file support will be disabled.]) + ac_have_libmad=0 fi fi +AC_SUBST(ac_have_libmad) # Check for optional libsamplerate library. if test "x$ac_libsamplerate" = "xyes"; then @@ -716,6 +734,9 @@ if test "x$ac_jack_latency" = "xyes"; th fi fi +# To dlopen plugins +ac_libs="$ac_libs -ldl" + # Some recent distros (eg. fedora, debian) require this. ac_libs="$ac_libs -lX11" @@ -1155,6 +1176,7 @@ echo " Gradient eye-candy . . . . . . . echo " Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace" echo echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix" +echo " Install libdir . . . . . . . . . . . . . . . . . .: $ac_libdir" echo echo "Now type 'make', followed by 'make install' as root." echo diff -rupN qtractor-0.5.5.old/Makefile.in qtractor-0.5.5/Makefile.in --- qtractor-0.5.5.old/Makefile.in 2012-05-25 12:55:11.000000000 -0400 +++ qtractor-0.5.5/Makefile.in 2012-06-24 04:39:18.798372418 -0400 @@ -2,10 +2,16 @@ prefix = @ac_prefix@ qmake = @ac_qmake@ lupdate = @ac_lupdate@ lrelease = @ac_lrelease@ +have_libmad = @ac_have_libmad@ name = qtractor target = src/$(name) +ifeq ($(have_libmad), 1) + mad_target = lib$(name)_mad.so + mad_install_target = install_mad + mad_clean_target = clean_mad +endif headers = \ src/config.h \ @@ -17,7 +23,6 @@ headers = \ src/qtractorAudioEngine.h \ src/qtractorAudioFile.h \ src/qtractorAudioListView.h \ - src/qtractorAudioMadFile.h \ src/qtractorAudioMeter.h \ src/qtractorAudioMonitor.h \ src/qtractorAudioPeak.h \ @@ -128,6 +133,12 @@ headers = \ src/qtractorTimeScaleForm.h \ src/qtractorTrackForm.h +mad_headers = \ + src/config.h \ + src/qtractorAudioMadFile.h \ + src/qtractorAudioFile.h + + sources = \ src/qtractor.cpp \ src/qtractorAudioBuffer.cpp \ @@ -136,7 +147,6 @@ sources = \ src/qtractorAudioEngine.cpp \ src/qtractorAudioFile.cpp \ src/qtractorAudioListView.cpp \ - src/qtractorAudioMadFile.cpp \ src/qtractorAudioMeter.cpp \ src/qtractorAudioMonitor.cpp \ src/qtractorAudioPeak.cpp \ @@ -239,6 +249,9 @@ sources = \ src/qtractorTimeScaleForm.cpp \ src/qtractorTrackForm.cpp +mad_sources = \ + src/qtractorAudioMadFile.cpp \ + forms = \ src/qtractorBusForm.ui \ src/qtractorClipForm.ui \ @@ -279,23 +292,33 @@ export datarootdir = @datarootdir@ export localedir = @localedir@ -all: $(target) $(translations_targets) +all: $(target) $(mad_target) $(translations_targets) $(target): $(name).mak $(resources) ${forms} $(sources) $(headers) @$(MAKE) -f $(name).mak +$(mad_target): $(name)_mad.mak $(mad_sources) $(mad_headers) + @$(MAKE) -f $(name)_mad.mak + $(name).mak: $(name).pro @$(qmake) -o $(name).mak $(name).pro +$(name)_mad.mak: $(name)_mad.pro + @$(qmake) -o $(name)_mad.mak $(name)_mad.pro + +mad_plugin: $(mad_target) + $(translation_targets): $(name).pro @$(lupdate) -verbose $(name).pro %.qm: %.ts @$(lrelease) -verbose $< -qm $@ +install_mad: $(mad_target) + @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name)_mad.mak install -install: $(target) $(translations_targets) +install: $(target) $(translations_targets) $(mad_install_target) @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install @install -d -v -m 0755 $(DESTDIR)$(localedir) @install -v -m 0644 $(translations_targets) $(DESTDIR)$(localedir) @@ -306,8 +329,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam @for x in $(translations_targets); do \ rm -vf $(DESTDIR)$(localedir)/`basename $$x`; done +clean_mad: $(name)_mad.mak + @$(MAKE) -f $(name)_mad.mak clean + @rm -f $(mad_target) $(name)_mad.mak -clean: $(name).mak +clean: $(name).mak $(mad_clean_target) @$(MAKE) -f $(name).mak clean @rm -f $(target) $(target).mak $(name).mak @rm -rf *.cache *.log *.status $(translations_targets) diff -rupN qtractor-0.5.5.old/qtractor_mad.pro qtractor-0.5.5/qtractor_mad.pro --- qtractor-0.5.5.old/qtractor_mad.pro 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/qtractor_mad.pro 2012-06-24 04:27:11.320512459 -0400 @@ -0,0 +1,9 @@ +# qtractor_mad.pro +# +QMAKEVERSION = $$[QMAKE_VERSION] +ISQT4 = $$find(QMAKEVERSION, ^[2-9]) +isEmpty( ISQT4 ) { + error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4"); +} + +include(src/mad.pri) diff -rupN qtractor-0.5.5.old/src/config.h.in qtractor-0.5.5/src/config.h.in --- qtractor-0.5.5.old/src/config.h.in 2012-06-15 06:13:53.000000000 -0400 +++ qtractor-0.5.5/src/config.h.in 2012-06-24 04:04:30.131475190 -0400 @@ -21,6 +21,9 @@ /* Define if LADSPA header is available. */ #undef CONFIG_LADSPA +/* Default installation libdir. */ +#undef CONFIG_LIBDIR + /* Define if liblilv is available. */ #undef CONFIG_LIBLILV @@ -84,6 +87,9 @@ /* Define if LV2 Worker/Schedule aupport is available. */ #undef CONFIG_LV2_WORKER +/* Default plugin installation dir. */ +#undef CONFIG_PLUGINDIR + /* Default installation prefix. */ #undef CONFIG_PREFIX diff -rupN qtractor-0.5.5.old/src/mad.pri qtractor-0.5.5/src/mad.pri --- qtractor-0.5.5.old/src/mad.pri 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/src/mad.pri 2012-06-24 04:26:06.994794380 -0400 @@ -0,0 +1,38 @@ +# qtractor.pro +# +TARGET = qtractor_mad + +TEMPLATE = lib +CONFIG += plugin +QT -= gui +DEPENDPATH += . +INCLUDEPATH += . + +include(src/src.pri) + +#DEFINES += DEBUG + +HEADERS += src/config.h \ + src/qtractorAudioFile.h \ + src/qtractorAudioMadFile.h + +SOURCES += \ + src/qtractorAudioMadFile.cpp + +unix { + # Additional link flags + LIBS = -lmad + + # variables + OBJECTS_DIR = .obj + + isEmpty(LIBDIR) { + LIBDIR = $$PREFIX/lib + } + + # make install + INSTALLS += target + + target.path = $$LIBDIR/qtractor + +} diff -rupN qtractor-0.5.5.old/src/qtractorAudioFile.cpp qtractor-0.5.5/src/qtractorAudioFile.cpp --- qtractor-0.5.5.old/src/qtractorAudioFile.cpp 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioFile.cpp 2012-06-24 04:09:36.980160092 -0400 @@ -29,7 +29,7 @@ #include <QRegExp> #include <stdlib.h> - +#include <dlfcn.h> //---------------------------------------------------------------------- // class qtractorAudioFileFactory -- Audio file factory (singleton). @@ -131,7 +131,8 @@ qtractorAudioFileFactory::qtractorAudioF m_pDefaultFormat = pFormat; #endif -#ifdef CONFIG_LIBMAD +if (madPluginExists()) +{ // Add for libmad (mp3 read-only)... pFormat = new FileFormat; pFormat->type = MadFile; @@ -142,7 +143,7 @@ qtractorAudioFileFactory::qtractorAudioF m_types[pFormat->ext] = pFormat; m_filters.append( sFilterMask.arg(pFormat->name).arg(sExtMask.arg(pFormat->ext))); -#endif + } // Finally, simply build the all (most commonly) supported files entry. QRegExp rx("^(aif(|f)|fla(|c)|mp3|ogg|w(av|64))", Qt::CaseInsensitive); @@ -198,13 +199,12 @@ qtractorAudioFile *qtractorAudioFileFact case VorbisFile: return new qtractorAudioVorbisFile(iChannels, iSampleRate, iBufferSize); case MadFile: - return new qtractorAudioMadFile(iBufferSize); + return getQtractorAudioMadFile(iBufferSize); default: return NULL; } } - const qtractorAudioFileFactory::FileFormats& qtractorAudioFileFactory::formats (void) { return getInstance().m_formats; @@ -322,5 +322,44 @@ int qtractorAudioFileFactory::format ( return 0; } +bool madPluginExists() +{ + void* madplugin = madPluginLibrary(); + if (!madplugin) return false; + dlclose(madplugin); + return true; +} + +void* madPluginLibrary() +{ + // load the mad plugin library + void* madplugin = dlopen(CONFIG_PLUGINDIR "/libqtractor_mad.so", RTLD_LAZY); + if (!madplugin) { +#ifdef CONFIG_DEBUG + qDebug("Cannot load library: %s", dlerror()); +#endif + return NULL; + } + return madplugin; +} + +qtractorAudioFile* getQtractorAudioMadFile(unsigned int iBufferSize) +{ + void* madplugin = madPluginLibrary(); + // reset errors + dlerror(); + // load the symbols + create_t* create_qtractorAudioMadFile = (create_t*) dlsym(madplugin, "createQtractorAudioMadFile"); + const char* dlsym_error = dlerror(); + if (dlsym_error) { +#ifdef CONFIG_DEBUG + qDebug("Cannot load symbol create_qtractorAudioMadFile: %s", dlsym_error) +#endif + return NULL; + } + // create an instance of the class + return create_qtractorAudioMadFile(iBufferSize); +} + // end of qtractorAudioFile.cpp diff -rupN qtractor-0.5.5.old/src/qtractorAudioFile.h qtractor-0.5.5/src/qtractorAudioFile.h --- qtractor-0.5.5.old/src/qtractorAudioFile.h 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioFile.h 2012-06-24 04:04:30.133475181 -0400 @@ -59,7 +59,6 @@ public: virtual unsigned int sampleRate() const = 0; }; - //---------------------------------------------------------------------- // class qtractorAudioFileFactory -- Audio file factory (singleton). // @@ -150,6 +149,19 @@ private: int m_iDefaultQuality; }; +// Dlopen the plugin library to get an qtractorAudioFile instance +qtractorAudioFile* getQtractorAudioMadFile(unsigned int iBufferSize); +// the type of the create factory +typedef qtractorAudioFile* create_t(unsigned int iBufferSize); +// Note that we will also need a destroy factory in case we overload "delete". +// If this is the case the dlopened library should handle its own destruction. +// Since we don't overload delete, we skip this factory for now. + +// Check whether we can dlopen the mad plugin library +bool madPluginExists(); +// Give us the mad plugin library object +void* madPluginLibrary(); + #endif // __qtractorAudioFile_h diff -rupN qtractor-0.5.5.old/src/qtractorAudioMadFile.cpp qtractor-0.5.5/src/qtractorAudioMadFile.cpp --- qtractor-0.5.5.old/src/qtractorAudioMadFile.cpp 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioMadFile.cpp 2012-06-24 04:04:30.134475176 -0400 @@ -24,6 +24,11 @@ #include <sys/stat.h> +// factory loader function +extern "C" qtractorAudioFile* createQtractorAudioMadFile( unsigned int iBufferSize ) { + return new qtractorAudioMadFile(iBufferSize); +} + //---------------------------------------------------------------------- // class qtractorAudioMadFile -- Buffered audio file implementation. diff -rupN qtractor-0.5.5.old/src/qtractorMainForm.cpp qtractor-0.5.5/src/qtractorMainForm.cpp --- qtractor-0.5.5.old/src/qtractorMainForm.cpp 2012-06-11 13:26:14.000000000 -0400 +++ qtractor-0.5.5/src/qtractorMainForm.cpp 2012-06-24 04:04:30.141475146 -0400 @@ -39,6 +39,7 @@ #include "qtractorAudioPeak.h" #include "qtractorAudioBuffer.h" #include "qtractorAudioEngine.h" +#include "qtractorAudioFile.h" #include "qtractorMidiEngine.h" #include "qtractorSessionDocument.h" @@ -4801,9 +4802,9 @@ void qtractorMainForm::helpAbout (void) list << tr("Ogg Vorbis (libvorbis) file support disabled."); #endif -#ifndef CONFIG_LIBMAD +if (!madPluginExists()) { list << tr("MPEG-1 Audio Layer 3 (libmad) file support disabled."); -#endif +} #ifndef CONFIG_LIBSAMPLERATE list << tr("Sample-rate conversion (libsamplerate) disabled."); #endif diff -rupN qtractor-0.5.5.old/src/src.pri.in qtractor-0.5.5/src/src.pri.in --- qtractor-0.5.5.old/src/src.pri.in 2010-09-25 18:08:05.000000000 -0400 +++ qtractor-0.5.5/src/src.pri.in 2012-06-24 04:26:15.516757012 -0400 @@ -1,6 +1,7 @@ # qtractor.pri # PREFIX = @ac_prefix@ +LIBDIR = @ac_libdir@ CONFIG += @ac_debug@ INCLUDEPATH += @ac_incpath@ LIBS += @ac_libs@ diff -rupN qtractor-0.5.5.old/src/src.pro qtractor-0.5.5/src/src.pro --- qtractor-0.5.5.old/src/src.pro 2012-05-25 12:55:11.000000000 -0400 +++ qtractor-0.5.5/src/src.pro 2012-06-24 04:04:30.143475138 -0400 @@ -19,7 +19,6 @@ HEADERS += config.h \ qtractorAudioEngine.h \ qtractorAudioFile.h \ qtractorAudioListView.h \ - qtractorAudioMadFile.h \ qtractorAudioMeter.h \ qtractorAudioMonitor.h \ qtractorAudioPeak.h \ @@ -141,7 +140,6 @@ SOURCES += \ qtractorAudioEngine.cpp \ qtractorAudioFile.cpp \ qtractorAudioListView.cpp \ - qtractorAudioMadFile.cpp \ qtractorAudioMeter.cpp \ qtractorAudioMonitor.cpp \ qtractorAudioPeak.cpp \ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/qtractor-freeworld/F-17/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2012 08:10:43 -0000 1.1 +++ .cvsignore 3 Sep 2012 04:20:23 -0000 1.2 @@ -0,0 +1 @@ +qtractor-0.5.5.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/qtractor-freeworld/F-17/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2012 08:10:43 -0000 1.1 +++ sources 3 Sep 2012 04:20:23 -0000 1.2 @@ -0,0 +1 @@ +ec3ad0f427a9e629fb0c42d10b4c2259 qtractor-0.5.5.tar.gz

11 years, 7 months

1
0
0 / 0

rpms/qtractor-freeworld/devel qtractor-freeworld.spec, NONE, 1.1 qtractor-libmad-factorout.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Brendan Jones

Author: bsjones Update of /cvs/free/rpms/qtractor-freeworld/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8642/devel Modified Files: .cvsignore sources Added Files: qtractor-freeworld.spec qtractor-libmad-factorout.patch Log Message: Initial import --- NEW FILE qtractor-freeworld.spec --- %ifarch %{ix86} %global without_sse %{!?_without_sse:0}%{?_without_sse:1} %endif %ifarch ia64 x86_64 %global without_sse 0 %endif %ifnarch %{ix86} ia64 x86_64 %global without_sse 1 %endif Summary: Audio/MIDI multi-track sequencer Name: qtractor-freeworld Version: 0.5.5 Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://qtractor.sourceforge.net/ Source0: http://downloads.sourceforge.net/qtractor/qtractor-%{version}.tar.gz Patch1: qtractor-libmad-factorout.patch BuildRequires: libmad-devel BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libsndfile-devel BuildRequires: qt-devel BuildRequires: autoconf BuildRequires: automake Requires: qtractor%{?_isa} = %{version} Obsoletes: qtractor < 0.5.5 %description Qtractor is an Audio/MIDI multi-track sequencer application written in C++ around the Qt4 toolkit using Qt Designer. The initial target platform will be Linux, where the Jack Audio Connection Kit (JACK) for audio, and the Advanced Linux Sound Architecture (ALSA) for MIDI, are the main infrastructures to evolve as a fairly-featured Linux Desktop Audio Workstation GUI, specially dedicated to the personal home-studio. %prep %setup -q -n qtractor-%{version} %patch1 -p1 # Fix odd permissions chmod -x src/qtractorMmcEvent.* %build autoreconf export PATH=${PATH}:%{_libdir}/qt4/bin # remove support for everything except libmad as we are only # building the libmad plugin %configure \ --enable-liblo=no \ --enable-libmad=yes \ --enable-dssi=no \ --enable-vst=no \ --enable-slv2=no \ --enable-lv2=no \ --enable-ladspa=no \ --enable-libsndfile=no \ --enable-libsamplerate=no \ --enable-libvorbis=no \ --enable-librubberband=no \ %if %{without_sse} --enable-sse=no %endif make mad_plugin %{?_smp_mflags} %install rm -rf %{buildroot} install -m 755 -d %{buildroot}%{_libdir}/qtractor install -m 755 libqtractor_mad.so %{buildroot}%{_libdir}/qtractor %files %doc AUTHORS ChangeLog COPYING README TODO %{_libdir}/qtractor %changelog * Wed Aug 15 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-2 - Correct directory ownership * Tue Jun 19 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-1 - Initial package qtractor-libmad-factorout.patch: Makefile.in | 36 +++++++++++++++++++++++++++---- configure.ac | 24 ++++++++++++++++++++- qtractor_mad.pro | 9 +++++++ src/config.h.in | 6 +++++ src/mad.pri | 38 +++++++++++++++++++++++++++++++++ src/qtractorAudioFile.cpp | 49 ++++++++++++++++++++++++++++++++++++++----- src/qtractorAudioFile.h | 14 +++++++++++- src/qtractorAudioMadFile.cpp | 5 ++++ src/qtractorMainForm.cpp | 5 ++-- src/src.pri.in | 1 src/src.pro | 2 - 11 files changed, 173 insertions(+), 16 deletions(-) --- NEW FILE qtractor-libmad-factorout.patch --- diff -rupN qtractor-0.5.5.old/configure.ac qtractor-0.5.5/configure.ac --- qtractor-0.5.5.old/configure.ac 2012-06-15 06:12:54.000000000 -0400 +++ qtractor-0.5.5/configure.ac 2012-06-24 04:26:35.076671263 -0400 @@ -14,6 +14,22 @@ fi AC_SUBST(ac_prefix) AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.]) +# Set default installation libdir and plugindir. +if test "x$exec_prefix" = "xNONE"; then + exec_prefix="${ac_prefix}" +fi + +ac_libdir=$libdir +if test "x$ac_libdir" = "xNONE"; then + ac_libdir=$ac_default_libdir +fi +# We want to make sure that this expands out. Otherwise we have bash variables +# such as ${exec_prefix} inside config.h: +eval ac_libdir="\"$ac_libdir\"" +AC_SUBST(ac_libdir) +AC_DEFINE_UNQUOTED(CONFIG_LIBDIR, ["$ac_libdir"], [Default installation libdir.]) +AC_DEFINE_UNQUOTED(CONFIG_PLUGINDIR, ["$ac_libdir/qtractor"], [Default plugin installation dir.]) + # Enable debugging argument option. AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]), @@ -550,12 +566,14 @@ if test "x$ac_libmad" = "xyes"; then AC_CHECK_LIB(mad, main, [ac_libmad="yes"], [ac_libmad="no"]) if test "x$ac_libmad" = "xyes"; then AC_DEFINE(CONFIG_LIBMAD, 1, [Define if libmad is available.]) - ac_libs="$ac_libs -lmad" + ac_have_libmad=1 else AC_MSG_WARN([*** mad library not found.]) AC_MSG_WARN([*** MPEG Layer III audio file support will be disabled.]) + ac_have_libmad=0 fi fi +AC_SUBST(ac_have_libmad) # Check for optional libsamplerate library. if test "x$ac_libsamplerate" = "xyes"; then @@ -716,6 +734,9 @@ if test "x$ac_jack_latency" = "xyes"; th fi fi +# To dlopen plugins +ac_libs="$ac_libs -ldl" + # Some recent distros (eg. fedora, debian) require this. ac_libs="$ac_libs -lX11" @@ -1155,6 +1176,7 @@ echo " Gradient eye-candy . . . . . . . echo " Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace" echo echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix" +echo " Install libdir . . . . . . . . . . . . . . . . . .: $ac_libdir" echo echo "Now type 'make', followed by 'make install' as root." echo diff -rupN qtractor-0.5.5.old/Makefile.in qtractor-0.5.5/Makefile.in --- qtractor-0.5.5.old/Makefile.in 2012-05-25 12:55:11.000000000 -0400 +++ qtractor-0.5.5/Makefile.in 2012-06-24 04:39:18.798372418 -0400 @@ -2,10 +2,16 @@ prefix = @ac_prefix@ qmake = @ac_qmake@ lupdate = @ac_lupdate@ lrelease = @ac_lrelease@ +have_libmad = @ac_have_libmad@ name = qtractor target = src/$(name) +ifeq ($(have_libmad), 1) + mad_target = lib$(name)_mad.so + mad_install_target = install_mad + mad_clean_target = clean_mad +endif headers = \ src/config.h \ @@ -17,7 +23,6 @@ headers = \ src/qtractorAudioEngine.h \ src/qtractorAudioFile.h \ src/qtractorAudioListView.h \ - src/qtractorAudioMadFile.h \ src/qtractorAudioMeter.h \ src/qtractorAudioMonitor.h \ src/qtractorAudioPeak.h \ @@ -128,6 +133,12 @@ headers = \ src/qtractorTimeScaleForm.h \ src/qtractorTrackForm.h +mad_headers = \ + src/config.h \ + src/qtractorAudioMadFile.h \ + src/qtractorAudioFile.h + + sources = \ src/qtractor.cpp \ src/qtractorAudioBuffer.cpp \ @@ -136,7 +147,6 @@ sources = \ src/qtractorAudioEngine.cpp \ src/qtractorAudioFile.cpp \ src/qtractorAudioListView.cpp \ - src/qtractorAudioMadFile.cpp \ src/qtractorAudioMeter.cpp \ src/qtractorAudioMonitor.cpp \ src/qtractorAudioPeak.cpp \ @@ -239,6 +249,9 @@ sources = \ src/qtractorTimeScaleForm.cpp \ src/qtractorTrackForm.cpp +mad_sources = \ + src/qtractorAudioMadFile.cpp \ + forms = \ src/qtractorBusForm.ui \ src/qtractorClipForm.ui \ @@ -279,23 +292,33 @@ export datarootdir = @datarootdir@ export localedir = @localedir@ -all: $(target) $(translations_targets) +all: $(target) $(mad_target) $(translations_targets) $(target): $(name).mak $(resources) ${forms} $(sources) $(headers) @$(MAKE) -f $(name).mak +$(mad_target): $(name)_mad.mak $(mad_sources) $(mad_headers) + @$(MAKE) -f $(name)_mad.mak + $(name).mak: $(name).pro @$(qmake) -o $(name).mak $(name).pro +$(name)_mad.mak: $(name)_mad.pro + @$(qmake) -o $(name)_mad.mak $(name)_mad.pro + +mad_plugin: $(mad_target) + $(translation_targets): $(name).pro @$(lupdate) -verbose $(name).pro %.qm: %.ts @$(lrelease) -verbose $< -qm $@ +install_mad: $(mad_target) + @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name)_mad.mak install -install: $(target) $(translations_targets) +install: $(target) $(translations_targets) $(mad_install_target) @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install @install -d -v -m 0755 $(DESTDIR)$(localedir) @install -v -m 0644 $(translations_targets) $(DESTDIR)$(localedir) @@ -306,8 +329,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam @for x in $(translations_targets); do \ rm -vf $(DESTDIR)$(localedir)/`basename $$x`; done +clean_mad: $(name)_mad.mak + @$(MAKE) -f $(name)_mad.mak clean + @rm -f $(mad_target) $(name)_mad.mak -clean: $(name).mak +clean: $(name).mak $(mad_clean_target) @$(MAKE) -f $(name).mak clean @rm -f $(target) $(target).mak $(name).mak @rm -rf *.cache *.log *.status $(translations_targets) diff -rupN qtractor-0.5.5.old/qtractor_mad.pro qtractor-0.5.5/qtractor_mad.pro --- qtractor-0.5.5.old/qtractor_mad.pro 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/qtractor_mad.pro 2012-06-24 04:27:11.320512459 -0400 @@ -0,0 +1,9 @@ +# qtractor_mad.pro +# +QMAKEVERSION = $$[QMAKE_VERSION] +ISQT4 = $$find(QMAKEVERSION, ^[2-9]) +isEmpty( ISQT4 ) { + error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4"); +} + +include(src/mad.pri) diff -rupN qtractor-0.5.5.old/src/config.h.in qtractor-0.5.5/src/config.h.in --- qtractor-0.5.5.old/src/config.h.in 2012-06-15 06:13:53.000000000 -0400 +++ qtractor-0.5.5/src/config.h.in 2012-06-24 04:04:30.131475190 -0400 @@ -21,6 +21,9 @@ /* Define if LADSPA header is available. */ #undef CONFIG_LADSPA +/* Default installation libdir. */ +#undef CONFIG_LIBDIR + /* Define if liblilv is available. */ #undef CONFIG_LIBLILV @@ -84,6 +87,9 @@ /* Define if LV2 Worker/Schedule aupport is available. */ #undef CONFIG_LV2_WORKER +/* Default plugin installation dir. */ +#undef CONFIG_PLUGINDIR + /* Default installation prefix. */ #undef CONFIG_PREFIX diff -rupN qtractor-0.5.5.old/src/mad.pri qtractor-0.5.5/src/mad.pri --- qtractor-0.5.5.old/src/mad.pri 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/src/mad.pri 2012-06-24 04:26:06.994794380 -0400 @@ -0,0 +1,38 @@ +# qtractor.pro +# +TARGET = qtractor_mad + +TEMPLATE = lib +CONFIG += plugin +QT -= gui +DEPENDPATH += . +INCLUDEPATH += . + +include(src/src.pri) + +#DEFINES += DEBUG + +HEADERS += src/config.h \ + src/qtractorAudioFile.h \ + src/qtractorAudioMadFile.h + +SOURCES += \ + src/qtractorAudioMadFile.cpp + +unix { + # Additional link flags + LIBS = -lmad + + # variables + OBJECTS_DIR = .obj + + isEmpty(LIBDIR) { + LIBDIR = $$PREFIX/lib + } + + # make install + INSTALLS += target + + target.path = $$LIBDIR/qtractor + +} diff -rupN qtractor-0.5.5.old/src/qtractorAudioFile.cpp qtractor-0.5.5/src/qtractorAudioFile.cpp --- qtractor-0.5.5.old/src/qtractorAudioFile.cpp 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioFile.cpp 2012-06-24 04:09:36.980160092 -0400 @@ -29,7 +29,7 @@ #include <QRegExp> #include <stdlib.h> - +#include <dlfcn.h> //---------------------------------------------------------------------- // class qtractorAudioFileFactory -- Audio file factory (singleton). @@ -131,7 +131,8 @@ qtractorAudioFileFactory::qtractorAudioF m_pDefaultFormat = pFormat; #endif -#ifdef CONFIG_LIBMAD +if (madPluginExists()) +{ // Add for libmad (mp3 read-only)... pFormat = new FileFormat; pFormat->type = MadFile; @@ -142,7 +143,7 @@ qtractorAudioFileFactory::qtractorAudioF m_types[pFormat->ext] = pFormat; m_filters.append( sFilterMask.arg(pFormat->name).arg(sExtMask.arg(pFormat->ext))); -#endif + } // Finally, simply build the all (most commonly) supported files entry. QRegExp rx("^(aif(|f)|fla(|c)|mp3|ogg|w(av|64))", Qt::CaseInsensitive); @@ -198,13 +199,12 @@ qtractorAudioFile *qtractorAudioFileFact case VorbisFile: return new qtractorAudioVorbisFile(iChannels, iSampleRate, iBufferSize); case MadFile: - return new qtractorAudioMadFile(iBufferSize); + return getQtractorAudioMadFile(iBufferSize); default: return NULL; } } - const qtractorAudioFileFactory::FileFormats& qtractorAudioFileFactory::formats (void) { return getInstance().m_formats; @@ -322,5 +322,44 @@ int qtractorAudioFileFactory::format ( return 0; } +bool madPluginExists() +{ + void* madplugin = madPluginLibrary(); + if (!madplugin) return false; + dlclose(madplugin); + return true; +} + +void* madPluginLibrary() +{ + // load the mad plugin library + void* madplugin = dlopen(CONFIG_PLUGINDIR "/libqtractor_mad.so", RTLD_LAZY); + if (!madplugin) { +#ifdef CONFIG_DEBUG + qDebug("Cannot load library: %s", dlerror()); +#endif + return NULL; + } + return madplugin; +} + +qtractorAudioFile* getQtractorAudioMadFile(unsigned int iBufferSize) +{ + void* madplugin = madPluginLibrary(); + // reset errors + dlerror(); + // load the symbols + create_t* create_qtractorAudioMadFile = (create_t*) dlsym(madplugin, "createQtractorAudioMadFile"); + const char* dlsym_error = dlerror(); + if (dlsym_error) { +#ifdef CONFIG_DEBUG + qDebug("Cannot load symbol create_qtractorAudioMadFile: %s", dlsym_error) +#endif + return NULL; + } + // create an instance of the class + return create_qtractorAudioMadFile(iBufferSize); +} + // end of qtractorAudioFile.cpp diff -rupN qtractor-0.5.5.old/src/qtractorAudioFile.h qtractor-0.5.5/src/qtractorAudioFile.h --- qtractor-0.5.5.old/src/qtractorAudioFile.h 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioFile.h 2012-06-24 04:04:30.133475181 -0400 @@ -59,7 +59,6 @@ public: virtual unsigned int sampleRate() const = 0; }; - //---------------------------------------------------------------------- // class qtractorAudioFileFactory -- Audio file factory (singleton). // @@ -150,6 +149,19 @@ private: int m_iDefaultQuality; }; +// Dlopen the plugin library to get an qtractorAudioFile instance +qtractorAudioFile* getQtractorAudioMadFile(unsigned int iBufferSize); +// the type of the create factory +typedef qtractorAudioFile* create_t(unsigned int iBufferSize); +// Note that we will also need a destroy factory in case we overload "delete". +// If this is the case the dlopened library should handle its own destruction. +// Since we don't overload delete, we skip this factory for now. + +// Check whether we can dlopen the mad plugin library +bool madPluginExists(); +// Give us the mad plugin library object +void* madPluginLibrary(); + #endif // __qtractorAudioFile_h diff -rupN qtractor-0.5.5.old/src/qtractorAudioMadFile.cpp qtractor-0.5.5/src/qtractorAudioMadFile.cpp --- qtractor-0.5.5.old/src/qtractorAudioMadFile.cpp 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioMadFile.cpp 2012-06-24 04:04:30.134475176 -0400 @@ -24,6 +24,11 @@ #include <sys/stat.h> +// factory loader function +extern "C" qtractorAudioFile* createQtractorAudioMadFile( unsigned int iBufferSize ) { + return new qtractorAudioMadFile(iBufferSize); +} + //---------------------------------------------------------------------- // class qtractorAudioMadFile -- Buffered audio file implementation. diff -rupN qtractor-0.5.5.old/src/qtractorMainForm.cpp qtractor-0.5.5/src/qtractorMainForm.cpp --- qtractor-0.5.5.old/src/qtractorMainForm.cpp 2012-06-11 13:26:14.000000000 -0400 +++ qtractor-0.5.5/src/qtractorMainForm.cpp 2012-06-24 04:04:30.141475146 -0400 @@ -39,6 +39,7 @@ #include "qtractorAudioPeak.h" #include "qtractorAudioBuffer.h" #include "qtractorAudioEngine.h" +#include "qtractorAudioFile.h" #include "qtractorMidiEngine.h" #include "qtractorSessionDocument.h" @@ -4801,9 +4802,9 @@ void qtractorMainForm::helpAbout (void) list << tr("Ogg Vorbis (libvorbis) file support disabled."); #endif -#ifndef CONFIG_LIBMAD +if (!madPluginExists()) { list << tr("MPEG-1 Audio Layer 3 (libmad) file support disabled."); -#endif +} #ifndef CONFIG_LIBSAMPLERATE list << tr("Sample-rate conversion (libsamplerate) disabled."); #endif diff -rupN qtractor-0.5.5.old/src/src.pri.in qtractor-0.5.5/src/src.pri.in --- qtractor-0.5.5.old/src/src.pri.in 2010-09-25 18:08:05.000000000 -0400 +++ qtractor-0.5.5/src/src.pri.in 2012-06-24 04:26:15.516757012 -0400 @@ -1,6 +1,7 @@ # qtractor.pri # PREFIX = @ac_prefix@ +LIBDIR = @ac_libdir@ CONFIG += @ac_debug@ INCLUDEPATH += @ac_incpath@ LIBS += @ac_libs@ diff -rupN qtractor-0.5.5.old/src/src.pro qtractor-0.5.5/src/src.pro --- qtractor-0.5.5.old/src/src.pro 2012-05-25 12:55:11.000000000 -0400 +++ qtractor-0.5.5/src/src.pro 2012-06-24 04:04:30.143475138 -0400 @@ -19,7 +19,6 @@ HEADERS += config.h \ qtractorAudioEngine.h \ qtractorAudioFile.h \ qtractorAudioListView.h \ - qtractorAudioMadFile.h \ qtractorAudioMeter.h \ qtractorAudioMonitor.h \ qtractorAudioPeak.h \ @@ -141,7 +140,6 @@ SOURCES += \ qtractorAudioEngine.cpp \ qtractorAudioFile.cpp \ qtractorAudioListView.cpp \ - qtractorAudioMadFile.cpp \ qtractorAudioMeter.cpp \ qtractorAudioMonitor.cpp \ qtractorAudioPeak.cpp \ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/qtractor-freeworld/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2012 08:10:43 -0000 1.1 +++ .cvsignore 3 Sep 2012 04:17:00 -0000 1.2 @@ -0,0 +1 @@ +qtractor-0.5.5.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/qtractor-freeworld/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2012 08:10:43 -0000 1.1 +++ sources 3 Sep 2012 04:17:00 -0000 1.2 @@ -0,0 +1 @@ +ec3ad0f427a9e629fb0c42d10b4c2259 qtractor-0.5.5.tar.gz

11 years, 7 months

1
0
0 / 0

rpms/qtractor-freeworld/F-18 qtractor-freeworld.spec, NONE, 1.1 qtractor-libmad-factorout.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Brendan Jones

Author: bsjones Update of /cvs/free/rpms/qtractor-freeworld/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6228/F-18 Modified Files: .cvsignore sources Added Files: qtractor-freeworld.spec qtractor-libmad-factorout.patch Log Message: Initial import --- NEW FILE qtractor-freeworld.spec --- %ifarch %{ix86} %global without_sse %{!?_without_sse:0}%{?_without_sse:1} %endif %ifarch ia64 x86_64 %global without_sse 0 %endif %ifnarch %{ix86} ia64 x86_64 %global without_sse 1 %endif Summary: Audio/MIDI multi-track sequencer Name: qtractor-freeworld Version: 0.5.5 Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://qtractor.sourceforge.net/ Source0: http://downloads.sourceforge.net/qtractor/qtractor-%{version}.tar.gz Patch1: qtractor-libmad-factorout.patch BuildRequires: libmad-devel BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libsndfile-devel BuildRequires: qt-devel BuildRequires: autoconf BuildRequires: automake Requires: qtractor%{?_isa} = %{version} Obsoletes: qtractor < 0.5.5 %description Qtractor is an Audio/MIDI multi-track sequencer application written in C++ around the Qt4 toolkit using Qt Designer. The initial target platform will be Linux, where the Jack Audio Connection Kit (JACK) for audio, and the Advanced Linux Sound Architecture (ALSA) for MIDI, are the main infrastructures to evolve as a fairly-featured Linux Desktop Audio Workstation GUI, specially dedicated to the personal home-studio. %prep %setup -q -n qtractor-%{version} %patch1 -p1 # Fix odd permissions chmod -x src/qtractorMmcEvent.* %build autoreconf export PATH=${PATH}:%{_libdir}/qt4/bin # remove support for everything except libmad as we are only # building the libmad plugin %configure \ --enable-liblo=no \ --enable-libmad=yes \ --enable-dssi=no \ --enable-vst=no \ --enable-slv2=no \ --enable-lv2=no \ --enable-ladspa=no \ --enable-libsndfile=no \ --enable-libsamplerate=no \ --enable-libvorbis=no \ --enable-librubberband=no \ %if %{without_sse} --enable-sse=no %endif make mad_plugin %{?_smp_mflags} %install rm -rf %{buildroot} install -m 755 -d %{buildroot}%{_libdir}/qtractor install -m 755 libqtractor_mad.so %{buildroot}%{_libdir}/qtractor %files %doc AUTHORS ChangeLog COPYING README TODO %{_libdir}/qtractor %changelog * Wed Aug 15 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-2 - Correct directory ownership * Tue Jun 19 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-1 - Initial package qtractor-libmad-factorout.patch: Makefile.in | 36 +++++++++++++++++++++++++++---- configure.ac | 24 ++++++++++++++++++++- qtractor_mad.pro | 9 +++++++ src/config.h.in | 6 +++++ src/mad.pri | 38 +++++++++++++++++++++++++++++++++ src/qtractorAudioFile.cpp | 49 ++++++++++++++++++++++++++++++++++++++----- src/qtractorAudioFile.h | 14 +++++++++++- src/qtractorAudioMadFile.cpp | 5 ++++ src/qtractorMainForm.cpp | 5 ++-- src/src.pri.in | 1 src/src.pro | 2 - 11 files changed, 173 insertions(+), 16 deletions(-) --- NEW FILE qtractor-libmad-factorout.patch --- diff -rupN qtractor-0.5.5.old/configure.ac qtractor-0.5.5/configure.ac --- qtractor-0.5.5.old/configure.ac 2012-06-15 06:12:54.000000000 -0400 +++ qtractor-0.5.5/configure.ac 2012-06-24 04:26:35.076671263 -0400 @@ -14,6 +14,22 @@ fi AC_SUBST(ac_prefix) AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.]) +# Set default installation libdir and plugindir. +if test "x$exec_prefix" = "xNONE"; then + exec_prefix="${ac_prefix}" +fi + +ac_libdir=$libdir +if test "x$ac_libdir" = "xNONE"; then + ac_libdir=$ac_default_libdir +fi +# We want to make sure that this expands out. Otherwise we have bash variables +# such as ${exec_prefix} inside config.h: +eval ac_libdir="\"$ac_libdir\"" +AC_SUBST(ac_libdir) +AC_DEFINE_UNQUOTED(CONFIG_LIBDIR, ["$ac_libdir"], [Default installation libdir.]) +AC_DEFINE_UNQUOTED(CONFIG_PLUGINDIR, ["$ac_libdir/qtractor"], [Default plugin installation dir.]) + # Enable debugging argument option. AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]), @@ -550,12 +566,14 @@ if test "x$ac_libmad" = "xyes"; then AC_CHECK_LIB(mad, main, [ac_libmad="yes"], [ac_libmad="no"]) if test "x$ac_libmad" = "xyes"; then AC_DEFINE(CONFIG_LIBMAD, 1, [Define if libmad is available.]) - ac_libs="$ac_libs -lmad" + ac_have_libmad=1 else AC_MSG_WARN([*** mad library not found.]) AC_MSG_WARN([*** MPEG Layer III audio file support will be disabled.]) + ac_have_libmad=0 fi fi +AC_SUBST(ac_have_libmad) # Check for optional libsamplerate library. if test "x$ac_libsamplerate" = "xyes"; then @@ -716,6 +734,9 @@ if test "x$ac_jack_latency" = "xyes"; th fi fi +# To dlopen plugins +ac_libs="$ac_libs -ldl" + # Some recent distros (eg. fedora, debian) require this. ac_libs="$ac_libs -lX11" @@ -1155,6 +1176,7 @@ echo " Gradient eye-candy . . . . . . . echo " Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace" echo echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix" +echo " Install libdir . . . . . . . . . . . . . . . . . .: $ac_libdir" echo echo "Now type 'make', followed by 'make install' as root." echo diff -rupN qtractor-0.5.5.old/Makefile.in qtractor-0.5.5/Makefile.in --- qtractor-0.5.5.old/Makefile.in 2012-05-25 12:55:11.000000000 -0400 +++ qtractor-0.5.5/Makefile.in 2012-06-24 04:39:18.798372418 -0400 @@ -2,10 +2,16 @@ prefix = @ac_prefix@ qmake = @ac_qmake@ lupdate = @ac_lupdate@ lrelease = @ac_lrelease@ +have_libmad = @ac_have_libmad@ name = qtractor target = src/$(name) +ifeq ($(have_libmad), 1) + mad_target = lib$(name)_mad.so + mad_install_target = install_mad + mad_clean_target = clean_mad +endif headers = \ src/config.h \ @@ -17,7 +23,6 @@ headers = \ src/qtractorAudioEngine.h \ src/qtractorAudioFile.h \ src/qtractorAudioListView.h \ - src/qtractorAudioMadFile.h \ src/qtractorAudioMeter.h \ src/qtractorAudioMonitor.h \ src/qtractorAudioPeak.h \ @@ -128,6 +133,12 @@ headers = \ src/qtractorTimeScaleForm.h \ src/qtractorTrackForm.h +mad_headers = \ + src/config.h \ + src/qtractorAudioMadFile.h \ + src/qtractorAudioFile.h + + sources = \ src/qtractor.cpp \ src/qtractorAudioBuffer.cpp \ @@ -136,7 +147,6 @@ sources = \ src/qtractorAudioEngine.cpp \ src/qtractorAudioFile.cpp \ src/qtractorAudioListView.cpp \ - src/qtractorAudioMadFile.cpp \ src/qtractorAudioMeter.cpp \ src/qtractorAudioMonitor.cpp \ src/qtractorAudioPeak.cpp \ @@ -239,6 +249,9 @@ sources = \ src/qtractorTimeScaleForm.cpp \ src/qtractorTrackForm.cpp +mad_sources = \ + src/qtractorAudioMadFile.cpp \ + forms = \ src/qtractorBusForm.ui \ src/qtractorClipForm.ui \ @@ -279,23 +292,33 @@ export datarootdir = @datarootdir@ export localedir = @localedir@ -all: $(target) $(translations_targets) +all: $(target) $(mad_target) $(translations_targets) $(target): $(name).mak $(resources) ${forms} $(sources) $(headers) @$(MAKE) -f $(name).mak +$(mad_target): $(name)_mad.mak $(mad_sources) $(mad_headers) + @$(MAKE) -f $(name)_mad.mak + $(name).mak: $(name).pro @$(qmake) -o $(name).mak $(name).pro +$(name)_mad.mak: $(name)_mad.pro + @$(qmake) -o $(name)_mad.mak $(name)_mad.pro + +mad_plugin: $(mad_target) + $(translation_targets): $(name).pro @$(lupdate) -verbose $(name).pro %.qm: %.ts @$(lrelease) -verbose $< -qm $@ +install_mad: $(mad_target) + @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name)_mad.mak install -install: $(target) $(translations_targets) +install: $(target) $(translations_targets) $(mad_install_target) @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install @install -d -v -m 0755 $(DESTDIR)$(localedir) @install -v -m 0644 $(translations_targets) $(DESTDIR)$(localedir) @@ -306,8 +329,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam @for x in $(translations_targets); do \ rm -vf $(DESTDIR)$(localedir)/`basename $$x`; done +clean_mad: $(name)_mad.mak + @$(MAKE) -f $(name)_mad.mak clean + @rm -f $(mad_target) $(name)_mad.mak -clean: $(name).mak +clean: $(name).mak $(mad_clean_target) @$(MAKE) -f $(name).mak clean @rm -f $(target) $(target).mak $(name).mak @rm -rf *.cache *.log *.status $(translations_targets) diff -rupN qtractor-0.5.5.old/qtractor_mad.pro qtractor-0.5.5/qtractor_mad.pro --- qtractor-0.5.5.old/qtractor_mad.pro 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/qtractor_mad.pro 2012-06-24 04:27:11.320512459 -0400 @@ -0,0 +1,9 @@ +# qtractor_mad.pro +# +QMAKEVERSION = $$[QMAKE_VERSION] +ISQT4 = $$find(QMAKEVERSION, ^[2-9]) +isEmpty( ISQT4 ) { + error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4"); +} + +include(src/mad.pri) diff -rupN qtractor-0.5.5.old/src/config.h.in qtractor-0.5.5/src/config.h.in --- qtractor-0.5.5.old/src/config.h.in 2012-06-15 06:13:53.000000000 -0400 +++ qtractor-0.5.5/src/config.h.in 2012-06-24 04:04:30.131475190 -0400 @@ -21,6 +21,9 @@ /* Define if LADSPA header is available. */ #undef CONFIG_LADSPA +/* Default installation libdir. */ +#undef CONFIG_LIBDIR + /* Define if liblilv is available. */ #undef CONFIG_LIBLILV @@ -84,6 +87,9 @@ /* Define if LV2 Worker/Schedule aupport is available. */ #undef CONFIG_LV2_WORKER +/* Default plugin installation dir. */ +#undef CONFIG_PLUGINDIR + /* Default installation prefix. */ #undef CONFIG_PREFIX diff -rupN qtractor-0.5.5.old/src/mad.pri qtractor-0.5.5/src/mad.pri --- qtractor-0.5.5.old/src/mad.pri 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/src/mad.pri 2012-06-24 04:26:06.994794380 -0400 @@ -0,0 +1,38 @@ +# qtractor.pro +# +TARGET = qtractor_mad + +TEMPLATE = lib +CONFIG += plugin +QT -= gui +DEPENDPATH += . +INCLUDEPATH += . + +include(src/src.pri) + +#DEFINES += DEBUG + +HEADERS += src/config.h \ + src/qtractorAudioFile.h \ + src/qtractorAudioMadFile.h + +SOURCES += \ + src/qtractorAudioMadFile.cpp + +unix { + # Additional link flags + LIBS = -lmad + + # variables + OBJECTS_DIR = .obj + + isEmpty(LIBDIR) { + LIBDIR = $$PREFIX/lib + } + + # make install + INSTALLS += target + + target.path = $$LIBDIR/qtractor + +} diff -rupN qtractor-0.5.5.old/src/qtractorAudioFile.cpp qtractor-0.5.5/src/qtractorAudioFile.cpp --- qtractor-0.5.5.old/src/qtractorAudioFile.cpp 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioFile.cpp 2012-06-24 04:09:36.980160092 -0400 @@ -29,7 +29,7 @@ #include <QRegExp> #include <stdlib.h> - +#include <dlfcn.h> //---------------------------------------------------------------------- // class qtractorAudioFileFactory -- Audio file factory (singleton). @@ -131,7 +131,8 @@ qtractorAudioFileFactory::qtractorAudioF m_pDefaultFormat = pFormat; #endif -#ifdef CONFIG_LIBMAD +if (madPluginExists()) +{ // Add for libmad (mp3 read-only)... pFormat = new FileFormat; pFormat->type = MadFile; @@ -142,7 +143,7 @@ qtractorAudioFileFactory::qtractorAudioF m_types[pFormat->ext] = pFormat; m_filters.append( sFilterMask.arg(pFormat->name).arg(sExtMask.arg(pFormat->ext))); -#endif + } // Finally, simply build the all (most commonly) supported files entry. QRegExp rx("^(aif(|f)|fla(|c)|mp3|ogg|w(av|64))", Qt::CaseInsensitive); @@ -198,13 +199,12 @@ qtractorAudioFile *qtractorAudioFileFact case VorbisFile: return new qtractorAudioVorbisFile(iChannels, iSampleRate, iBufferSize); case MadFile: - return new qtractorAudioMadFile(iBufferSize); + return getQtractorAudioMadFile(iBufferSize); default: return NULL; } } - const qtractorAudioFileFactory::FileFormats& qtractorAudioFileFactory::formats (void) { return getInstance().m_formats; @@ -322,5 +322,44 @@ int qtractorAudioFileFactory::format ( return 0; } +bool madPluginExists() +{ + void* madplugin = madPluginLibrary(); + if (!madplugin) return false; + dlclose(madplugin); + return true; +} + +void* madPluginLibrary() +{ + // load the mad plugin library + void* madplugin = dlopen(CONFIG_PLUGINDIR "/libqtractor_mad.so", RTLD_LAZY); + if (!madplugin) { +#ifdef CONFIG_DEBUG + qDebug("Cannot load library: %s", dlerror()); +#endif + return NULL; + } + return madplugin; +} + +qtractorAudioFile* getQtractorAudioMadFile(unsigned int iBufferSize) +{ + void* madplugin = madPluginLibrary(); + // reset errors + dlerror(); + // load the symbols + create_t* create_qtractorAudioMadFile = (create_t*) dlsym(madplugin, "createQtractorAudioMadFile"); + const char* dlsym_error = dlerror(); + if (dlsym_error) { +#ifdef CONFIG_DEBUG + qDebug("Cannot load symbol create_qtractorAudioMadFile: %s", dlsym_error) +#endif + return NULL; + } + // create an instance of the class + return create_qtractorAudioMadFile(iBufferSize); +} + // end of qtractorAudioFile.cpp diff -rupN qtractor-0.5.5.old/src/qtractorAudioFile.h qtractor-0.5.5/src/qtractorAudioFile.h --- qtractor-0.5.5.old/src/qtractorAudioFile.h 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioFile.h 2012-06-24 04:04:30.133475181 -0400 @@ -59,7 +59,6 @@ public: virtual unsigned int sampleRate() const = 0; }; - //---------------------------------------------------------------------- // class qtractorAudioFileFactory -- Audio file factory (singleton). // @@ -150,6 +149,19 @@ private: int m_iDefaultQuality; }; +// Dlopen the plugin library to get an qtractorAudioFile instance +qtractorAudioFile* getQtractorAudioMadFile(unsigned int iBufferSize); +// the type of the create factory +typedef qtractorAudioFile* create_t(unsigned int iBufferSize); +// Note that we will also need a destroy factory in case we overload "delete". +// If this is the case the dlopened library should handle its own destruction. +// Since we don't overload delete, we skip this factory for now. + +// Check whether we can dlopen the mad plugin library +bool madPluginExists(); +// Give us the mad plugin library object +void* madPluginLibrary(); + #endif // __qtractorAudioFile_h diff -rupN qtractor-0.5.5.old/src/qtractorAudioMadFile.cpp qtractor-0.5.5/src/qtractorAudioMadFile.cpp --- qtractor-0.5.5.old/src/qtractorAudioMadFile.cpp 2011-05-14 18:03:38.000000000 -0400 +++ qtractor-0.5.5/src/qtractorAudioMadFile.cpp 2012-06-24 04:04:30.134475176 -0400 @@ -24,6 +24,11 @@ #include <sys/stat.h> +// factory loader function +extern "C" qtractorAudioFile* createQtractorAudioMadFile( unsigned int iBufferSize ) { + return new qtractorAudioMadFile(iBufferSize); +} + //---------------------------------------------------------------------- // class qtractorAudioMadFile -- Buffered audio file implementation. diff -rupN qtractor-0.5.5.old/src/qtractorMainForm.cpp qtractor-0.5.5/src/qtractorMainForm.cpp --- qtractor-0.5.5.old/src/qtractorMainForm.cpp 2012-06-11 13:26:14.000000000 -0400 +++ qtractor-0.5.5/src/qtractorMainForm.cpp 2012-06-24 04:04:30.141475146 -0400 @@ -39,6 +39,7 @@ #include "qtractorAudioPeak.h" #include "qtractorAudioBuffer.h" #include "qtractorAudioEngine.h" +#include "qtractorAudioFile.h" #include "qtractorMidiEngine.h" #include "qtractorSessionDocument.h" @@ -4801,9 +4802,9 @@ void qtractorMainForm::helpAbout (void) list << tr("Ogg Vorbis (libvorbis) file support disabled."); #endif -#ifndef CONFIG_LIBMAD +if (!madPluginExists()) { list << tr("MPEG-1 Audio Layer 3 (libmad) file support disabled."); -#endif +} #ifndef CONFIG_LIBSAMPLERATE list << tr("Sample-rate conversion (libsamplerate) disabled."); #endif diff -rupN qtractor-0.5.5.old/src/src.pri.in qtractor-0.5.5/src/src.pri.in --- qtractor-0.5.5.old/src/src.pri.in 2010-09-25 18:08:05.000000000 -0400 +++ qtractor-0.5.5/src/src.pri.in 2012-06-24 04:26:15.516757012 -0400 @@ -1,6 +1,7 @@ # qtractor.pri # PREFIX = @ac_prefix@ +LIBDIR = @ac_libdir@ CONFIG += @ac_debug@ INCLUDEPATH += @ac_incpath@ LIBS += @ac_libs@ diff -rupN qtractor-0.5.5.old/src/src.pro qtractor-0.5.5/src/src.pro --- qtractor-0.5.5.old/src/src.pro 2012-05-25 12:55:11.000000000 -0400 +++ qtractor-0.5.5/src/src.pro 2012-06-24 04:04:30.143475138 -0400 @@ -19,7 +19,6 @@ HEADERS += config.h \ qtractorAudioEngine.h \ qtractorAudioFile.h \ qtractorAudioListView.h \ - qtractorAudioMadFile.h \ qtractorAudioMeter.h \ qtractorAudioMonitor.h \ qtractorAudioPeak.h \ @@ -141,7 +140,6 @@ SOURCES += \ qtractorAudioEngine.cpp \ qtractorAudioFile.cpp \ qtractorAudioListView.cpp \ - qtractorAudioMadFile.cpp \ qtractorAudioMeter.cpp \ qtractorAudioMonitor.cpp \ qtractorAudioPeak.cpp \ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/qtractor-freeworld/F-18/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2012 08:10:43 -0000 1.1 +++ .cvsignore 3 Sep 2012 03:35:52 -0000 1.2 @@ -0,0 +1 @@ +qtractor-0.5.5.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/qtractor-freeworld/F-18/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2012 08:10:43 -0000 1.1 +++ sources 3 Sep 2012 03:35:52 -0000 1.2 @@ -0,0 +1 @@ +ec3ad0f427a9e629fb0c42d10b4c2259 qtractor-0.5.5.tar.gz

11 years, 7 months

1
0
0 / 0

rpms/VirtualBox/devel VirtualBox-4.1.20-x113.patch, NONE, 1.1 VirtualBox-4.2.0-libcxx.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, NONE, 1.1 VirtualBox-OSE-4.0.0-makeself.patch, 1.1, 1.2 VirtualBox.spec, 1.16, 1.17 VirtualBox-4.1.20-libcxx.patch, 1.2, NONE VirtualBox-OSE-3.2.0-visibility.patch, 1.1, NONE VirtualBox-OSE-4.0.0-32bit.patch, 1.2, NONE VirtualBox-OSE-4.1.2-testmangle.patch, 1.1, NONE VirtualBox-OSE-4.1.2-usblib.patch, 1.1, NONE VirtualBox-OSE-4.1.4-xorg17.patch, 1.3, NONE

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5729 Modified Files: VirtualBox-OSE-4.0.0-makeself.patch VirtualBox.spec Added Files: VirtualBox-4.1.20-x113.patch VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-xorg17.patch Removed Files: VirtualBox-4.1.20-libcxx.patch VirtualBox-OSE-3.2.0-visibility.patch VirtualBox-OSE-4.0.0-32bit.patch VirtualBox-OSE-4.1.2-testmangle.patch VirtualBox-OSE-4.1.2-usblib.patch VirtualBox-OSE-4.1.4-xorg17.patch Log Message: * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC3 - vim :retab, reformat all tabs. - add BR # libstdc++.i686 and libc-devel.i686 for 32-bits BuildRequires: /usr/lib/libc.so BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 - drop 32-bit patch and testmangle patch, no fails. - rename and remove some patches cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available cvs diff: VirtualBox-4.2.0-libcxx.patch is a new entry, no comparison available cvs diff: VirtualBox-4.2.0-xorg17.patch is a new entry, no comparison available cvs diff: VirtualBox-OSE-3.2.0-visibility.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.0.0-32bit.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.1.2-testmangle.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.1.2-usblib.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available VirtualBox-4.1.20-x113.patch: VirtualBox-4.2.0_RC3/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk | 6 + b/Config.kmk | 32 +++++----- b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c | 8 +- b/src/VBox/Runtime/Makefile.kmk | 2 src/VBox/Main/Makefile.kmk | 2 5 files changed, 28 insertions(+), 22 deletions(-) --- NEW FILE VirtualBox-4.1.20-x113.patch --- X.org 1.13 patch --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c.orig 2012-09-02 05:45:06.134994216 +0100 +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2012-09-02 05:45:20.136137244 +0100 @@ -709,7 +709,7 @@ vboxEnableDisableFBAccess(int scrnIndex, TRACE_LOG("enable=%s\n", enable ? "TRUE" : "FALSE"); VBOXSetRec(pScrn); pVBox->accessEnabled = enable; - pVBox->EnableDisableFBAccess(scrnIndex, enable); + pVBox->EnableDisableFBAccess(pScrn, enable); TRACE_EXIT(); } @@ -1198,7 +1198,7 @@ VBOXCloseScreen(int scrnIndex, ScreenPtr /* Remove our observer functions from the X server call chains. */ pScrn->EnableDisableFBAccess = pVBox->EnableDisableFBAccess; pScreen->CloseScreen = pVBox->CloseScreen; - return pScreen->CloseScreen(scrnIndex, pScreen); + return pScreen->CloseScreen(pScreen); } static Bool @@ -1214,7 +1214,7 @@ VBOXSwitchMode(int scrnIndex, DisplayMod /* We want to disable access to the framebuffer before switching mode. * After doing the switch, we allow access if it was allowed before. */ if (pVBox->accessEnabled) - pVBox->EnableDisableFBAccess(scrnIndex, FALSE); + pVBox->EnableDisableFBAccess(pScrn, FALSE); #ifdef VBOXVIDEO_13 rc = xf86SetSingleMode(pScrn, pMode, 0); #else @@ -1231,7 +1231,7 @@ VBOXSwitchMode(int scrnIndex, DisplayMod pScrn->bitsPerPixel); #endif if (pVBox->accessEnabled) - pVBox->EnableDisableFBAccess(scrnIndex, TRUE); + pVBox->EnableDisableFBAccess(pScrn, TRUE); TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE"); return rc; } --- a/Config.kmk.x113 2012-09-02 17:55:59.642186269 +0100 +++ b/Config.kmk 2012-09-02 18:30:18.743236550 +0100 @@ -546,9 +546,9 @@ VBOX_WITH_MULTIVERSION_PYTHON ?= 1 # Enable the kchmviewer. VBOX_WITH_KCHMVIEWER = 1 # Build the testsuite. -VBOX_WITH_TESTSUITE = 1 +VBOX_WITH_TESTSUITE = 0 # Build the testcases. -VBOX_WITH_TESTCASES = 1 +VBOX_WITH_TESTCASES = 0 # Enables the ffmpeg module for recording test runs. # TODO: Enable this for normal build server builds? #if1of ($(KBUILD_TARGET), linux) @@ -4977,30 +4977,30 @@ endif # Guest additions libraries (all static). # The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib. # -VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) -VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB) -VBOX_LIB_IPRT_GUEST_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared$(VBOX_SUFF_LIB) -VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_DLL) ifeq ($(KBUILD_TARGET_ARCH),x86) - VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_LIB) + VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_DLL) else VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_LIB_IPRT_GUEST_R0) endif -VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R0BASE = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R0 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_LIB) +VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) +VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_DLL) +VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB) +VBOX_LIB_VBGL_R0BASE = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_DLL) +VBOX_LIB_VBGL_R0 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_DLL) ifeq ($(KBUILD_TARGET),x86) VBOX_LIB_IPRT_GUEST_R3_X86 = $(VBOX_LIB_IPRT_GUEST_R3) VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_LIB_IPRT_GUEST_R3_SHARED) VBOX_LIB_VBGL_R3_X86 = $(VBOX_LIB_VBGL_R3) VBOX_LIB_VBGL_R3_SHARED_X86 = $(VBOX_LIB_VBGL_R3_SHARED) else - VBOX_LIB_IPRT_GUEST_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3-x86$(VBOX_SUFF_LIB) - VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared-x86$(VBOX_SUFF_LIB) - VBOX_LIB_VBGL_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib-x86$(VBOX_SUFF_LIB) - VBOX_LIB_VBGL_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared-x86$(VBOX_SUFF_LIB) + VBOX_LIB_IPRT_GUEST_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3-x86$(VBOX_SUFF_DLL) + VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared-x86$(VBOX_SUFF_DLL) + VBOX_LIB_VBGL_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib-x86$(VBOX_SUFF_DLL) + VBOX_LIB_VBGL_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared-x86$(VBOX_SUFF_DLL) endif --- VirtualBox-4.2.0_RC3/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk.orig 2012-09-02 18:32:05.119324113 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk 2012-05-30 11:38:10.000000000 +0100 @@ -21,7 +21,9 @@ include $(KBUILD_PATH)/subheader.kmk # # Structure size testcase. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstShflSizes +endif TESTING += $(tstShflSizes_0_OUTDIR)/tstShflSizes.run ifndef VBOX_ONLY_SDK ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) @@ -44,7 +46,9 @@ ifdef VBOX_WITH_TESTCASES # # Case conversion testcase. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstShflCase +endif tstShflCase_TEMPLATE = VBOXR3TSTEXE tstShflCase_DEFS = VBOX_WITH_HGCM tstShflCase_SOURCES = tstShflCase.cpp @@ -56,9 +60,11 @@ tstShflCase_LIBS = $(LIB_RUNTIME) # As there are differences between the Windows build of the service and others, # we do an additional build with RT_OS_WINDOWS defined on non-Windows targets. +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += \ tstSharedFolderService \ $(if $(eq $(KBUILD_TARGET),win),,tstSharedFolderService-win) +endif tstSharedFolderService_TEMPLATE = VBOXR3TSTEXE tstSharedFolderService_DEFS = VBOX_WITH_HGCM UNITTEST --- a/src/VBox/Main/Makefile.kmk 2012-08-29 15:13:36.000000000 +0100 +++ b/src/VBox/Main/Makefile.kmk 2012-09-02 19:09:49.250454117 +0100 @@ -705,7 +705,7 @@ $$(VBoxC_0_OUTDIR)/VBoxC.rgs: $(VBOX_PAT # VBoxCOM - COM Abstraction Layer library # LIBRARIES += VBoxCOM -VBoxCOM_TEMPLATE = VBOXMAINLIB +VBoxCOM_TEMPLATE = VBOXMAINDLL VBoxCOM_INTERMEDIATES = $(VBOX_MAIN_PREREQS) VBoxCOM_SOURCES = \ glue/com.cpp \ --- a/src/VBox/Runtime/Makefile.kmk.testmangle 2012-08-29 15:13:34.000000000 +0100 +++ b/src/VBox/Runtime/Makefile.kmk 2012-09-02 19:30:41.688859884 +0100 @@ -211,7 +211,7 @@ endif # # RuntimeR3 - Static Runtime for Ring-3 executables. # -RuntimeR3_TEMPLATE = VBoxR3Static +RuntimeR3_TEMPLATE = VBOXR3DLLNOXCPT RuntimeR3_SDKS = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib... RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) RuntimeR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP VirtualBox-4.2.0-libcxx.patch: Config.kmk | 4 ++-- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 20 insertions(+), 23 deletions(-) --- NEW FILE VirtualBox-4.2.0-libcxx.patch --- >From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 18 Jun 2010 10:58:14 +0200 Subject: [PATCH 2/3] Do not include statically linked libstdc++ Not a good idea if we don't need to be binary-compatible across exotic distribution. Doesn't work with trunk glibc heading towards 2.11 anyways. Static linking is not really supported anyways. --- Config.kmk | 4 ++-- configure | 2 +- .../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.1/Makefile.kmk | 2 +- 17 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Config.kmk b/Config.kmk index 0ea34d8..2ec388c 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl TEMPLATE_VBOXR3EXE_LIBS = \ $(L4_LIBDIR)/libvboxserver.s.so \ $(L4_LIBDIR)/libuc++.0.s.so \ - supc++ gcc_eh gcc \ + stdc++ \ $(L4_LIBDIR)/libdl.s.so \ $(L4_LIBDIR)/libuc.0.s.so else ifeq ($(KBUILD_TARGET),os2) @@ -3311,7 +3311,7 @@ endif # Temporary: Renaming the template and warnings will be errors (soon). # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure +++ b/configure @@ -2582,7 +2582,7 @@ fi if [ "$OS" = "linux" ]; then # don't check for the static libstdc++ in the PUEL version as we build the # additions at a dedicated box - [ $OSE -ge 1 ] && check_staticlibstdcxx + #[ $OSE -ge 1 ] && check_staticlibstdcxx if [ $WITH_KMODS -eq 1 ]; then check_linux else --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk 2012-09-02 02:55:41.970453638 +0100 @@ -195,7 +195,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE vbvdbg_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH) vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ --- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 +++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2012-09-02 03:13:43.602348048 +0100 @@ -49,9 +49,7 @@ VBoxClient_LIBS = \ Xt # Xtst # These are static replacements for gcc-specific parts of libstdc++ -VBoxClient_LIBS += \ - supc++ \ - gcc_eh +VBoxClient_LIBS += stdc++ ifdef VBOX_X11_SEAMLESS_GUEST VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE VBoxClient_SOURCES += \ diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b..2ee8418 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -957,7 +957,7 @@ endif # darwin if defined(VBOX_WITH_VIDEOHWACCEL) if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D - VBoxOGL2D_TEMPLATE = VBOXR3STATIC + VBoxOGL2D_TEMPLATE = VBOXR3EXE VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL --- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100 +++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100 @@ -94,7 +94,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # -SUPR3Static_TEMPLATE = VBOXR3STATIC +SUPR3Static_TEMPLATE = VBOXR3EXE SUPR3Static_EXTENDS = SUPR3 # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100 +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100 @@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE WinNetConfig_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) WinNetConfig_SOURCES = \ @@ -154,7 +154,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE NetFltInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ @@ -169,7 +169,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE NetFltUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ @@ -183,7 +183,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE NetAdpInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ @@ -198,7 +198,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE NetAdpUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ @@ -212,7 +212,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) VBoxNetFltNobj_INSTTYPE = none VBoxNetFltNobj_DEBUG_INSTTYPE = both --- a/src/VBox/HostDrivers/win/Makefile.kmk.libcxx 2012-07-18 09:58:10.000000000 +0100 +++ b/src/VBox/HostDrivers/win/Makefile.kmk 2012-09-02 02:39:16.639533050 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE VBoxDrvCfg_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk.libcxx 2012-08-03 13:28:30.000000000 +0100 +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk 2012-09-02 02:59:34.062788499 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC +VBoxInstallHelper_TEMPLATE = VBOXR3EXE VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) --- a/src/VBox/Installer/win/Resources/Makefile.kmk.libcxx 2012-05-30 11:38:23.000000000 +0100 +++ b/src/VBox/Installer/win/Resources/Makefile.kmk 2012-09-02 02:57:56.559807746 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC +VBoxRes_TEMPLATE = VBOXR3EXE VBoxRes_DEPS = $(VBOX_SVN_REV_KMK) VBoxRes_SOURCES = \ dummy.cpp \ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89eb..6cf55cc 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if "$(KBUILD_TARGET_ARCH)" == "x86" TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. -TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC +TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) PROGRAMS.x86 += VBoxStub diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05..40f6bf2 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES # # vbox-img - static because it migth be used as at standalone tool. # - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3 vbox-img_SOURCES = \ vbox-img.cpp \ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fa..0afe89a 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \ lzf_c.c \ lzf_d.c -VBox-liblzf-static_TEMPLATE = VBOXR3STATIC +VBox-liblzf-static_TEMPLATE = VBOXR3EXE VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 --- a/src/libs/zlib-1.2.6/Makefile.kmk +++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c -VBox-zlib-static_TEMPLATE = VBOXR3STATIC +VBox-zlib-static_TEMPLATE = VBOXR3EXE VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES) -- 1.7.1 VirtualBox-4.2.0-xorg17.patch: b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 ++--- b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 15 +++++- b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 40 +++++++++++++++++ src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 - 4 files changed, 60 insertions(+), 13 deletions(-) --- NEW FILE VirtualBox-4.2.0-xorg17.patch --- Based: Description: Build the X.Org driver only for the selected system X Server version. Author: Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de> diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk @@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ - $(VBOX_PATH_X11_ROOT)/1.3/xorg \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 + /usr/include/drm \ + /usr/include/libdrm VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100 +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-02 23:44:33.878251237 +0100 @@ -57,9 +57,18 @@ if1of ($(KBUILD_TARGET), linux) vboxmouse_drv_POST_CMDS = \ objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \ $(MV) -f $(out)-objcopy $(out) -endif - +DLLS += vboxmouse_drv_17 +vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD +vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \ + DONT_DEFINE_WRAPPERS NO_ANSIC +vboxmouse_drv_17_INCS := \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 +vboxmouse_drv_17_SOURCES = \ + vboxmouse.c +else # # vboxmouse_drv_70 # @@ -391,5 +398,7 @@ endif # neq ($(KBUILD_TARGET),linux) # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES +endif # neq ($(KBUILD_TARGET),linux) + include $(FILE_KBUILD_SUB_FOOTER) --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100 +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-03 00:00:13.988618277 +0100 @@ -94,6 +94,44 @@ vboxvideo_drv_SOURCES = \ objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \ $(MV) -f $(out)-objcopy $(out) +DLLS += vboxvideo_drv_17 +vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD +vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template? +vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \ + IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI +vboxvideo_drv_17_INCS = \ + /usr/include/drm \ + /usr/include/X11/dri \ + /usr/include/pixman-1 \ + /usr/share/xorg-x11-server-source \ + /usr/share/xorg-x11-server-source/fb \ + /usr/share/xorg-x11-server-source/hw/xfree86/common \ + /usr/share/xorg-x11-server-source/hw/xfree86/ddc \ + /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \ + /usr/share/xorg-x11-server-source/hw/xfree86/dri \ + /usr/share/xorg-x11-server-source/hw/xfree86/i2c \ + /usr/share/xorg-x11-server-source/hw/xfree86/int10 \ + /usr/share/xorg-x11-server-source/hw/xfree86/modes \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \ + /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \ + /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \ + /usr/share/xorg-x11-server-source/hw/xfree86/vbe \ + /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \ + /usr/share/xorg-x11-server-source/hw/xquartz/xpr \ + /usr/share/xorg-x11-server-source/include \ + /usr/share/xorg-x11-server-source/mi \ + /usr/share/xorg-x11-server-source/miext/damage \ + /usr/share/xorg-x11-server-source/randr \ + /usr/share/xorg-x11-server-source/Xext \ + /usr/share/xorg-x11-server-source/render \ + /usr/share/xorg-x11-server-source/hw/xfree86/parser +vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include +vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES) edid.c vboxvideo_dri.c + +ifdef NOT_FEDORA + + # # vboxvideo_drv_70 # @@ -505,4 +543,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES +endif # NOT_FEDORA + include $(FILE_KBUILD_SUB_FOOTER) --- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000 +++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000 @@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK # tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE tstSetModeXOrg_CFLAGS += -std=c99 -tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE +tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE tstSetModeXOrg_SOURCES = \ tstSetModeXOrg.c \ ../setmode.c -tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS) +tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS) # generate rules. VirtualBox-OSE-4.0.0-makeself.patch: configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: VirtualBox-OSE-4.0.0-makeself.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.0.0-makeself.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-OSE-4.0.0-makeself.patch 3 Feb 2011 23:25:21 -0000 1.1 +++ VirtualBox-OSE-4.0.0-makeself.patch 3 Sep 2012 03:30:25 -0000 1.2 @@ -14,7 +14,7 @@ +++ b/configure @@ -2527,7 +2527,7 @@ if [ "$OS" = "linux" ]; then check_compiler_h - #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit # tools/common/makeself* - [ $OSE -ge 1 ] && check_makeself + #[ $OSE -ge 1 ] && check_makeself Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- VirtualBox.spec 3 Sep 2012 01:28:08 -0000 1.16 +++ VirtualBox.spec 3 Sep 2012 03:30:26 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # Standard compiler flags, without: -# -Wall -- VirtualBox takes care of reasonable warnings very well +# -Wall -- VirtualBox takes care of reasonable warnings very well # -m32, -m64 -- 32bit code is built besides 64bit on x86_64 # -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0 %global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//') @@ -13,71 +13,70 @@ %global prerel RC3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -Name: VirtualBox -Version: 4.2.0 -Release: 0.1%{?prerel:.%{prerel}}%{?dist} -Summary: A general-purpose full virtualizer for PC hardware - -Group: Development/Tools -License: GPLv2 or (GPLv2 and CDDL) -URL: http://www.virtualbox.org/wiki/VirtualBox -Source0: http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu... -Source3: VirtualBox-90-vboxdrv.rules -Source5: VirtualBox-60-vboxguest.rules -Source6: VirtualBox.modules -Source7: VirtualBox-guest.modules -Source8: VirtualBox-vboxresize.desktop -Source9: VirtualBox-00-vboxvideo.conf -Source10: vboxweb.service -Source11: vboxservice.service -Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-4.1.18-strings.patch -Patch3: VirtualBox-4.1.20-libcxx.patch -Patch5: VirtualBox-OSE-4.1.4-xorg17.patch -Patch10: VirtualBox-OSE-4.0.0-32bit.patch -#Patch11: VirtualBox-OSE-3.2.0-visibility.patch -Patch15: VirtualBox-OSE-4.0.0-makeself.patch -#Patch16: VirtualBox-OSE-4.1.2-usblib.patch -Patch17: VirtualBox-OSE-4.0.0-beramono.patch -Patch18: VirtualBox-OSE-4.0.2-aiobug.patch -Patch20: VirtualBox-OSE-4.1.2-testmangle.patch -Patch22: VirtualBox-OSE-4.1.12-gsoap.patch -Patch23: VirtualBox-OSE-4.1.10-mesa.patch +Name: VirtualBox +Version: 4.2.0 +Release: 0.2%{?prerel:.%{prerel}}%{?dist} +Summary: A general-purpose full virtualizer for PC hardware + +Group: Development/Tools +License: GPLv2 or (GPLv2 and CDDL) +URL: http://www.virtualbox.org/wiki/VirtualBox +Source0: http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu... +Source3: VirtualBox-90-vboxdrv.rules +Source5: VirtualBox-60-vboxguest.rules +Source6: VirtualBox.modules +Source7: VirtualBox-guest.modules +Source8: VirtualBox-vboxresize.desktop +Source9: VirtualBox-00-vboxvideo.conf +Source10: vboxweb.service +Source11: vboxservice.service +Patch1: VirtualBox-OSE-4.1.4-noupdate.patch +Patch2: VirtualBox-4.1.18-strings.patch +Patch3: VirtualBox-4.2.0-libcxx.patch +Patch5: VirtualBox-4.2.0-xorg17.patch +Patch15: VirtualBox-OSE-4.0.0-makeself.patch +Patch17: VirtualBox-OSE-4.0.0-beramono.patch +Patch18: VirtualBox-OSE-4.0.2-aiobug.patch +Patch22: VirtualBox-OSE-4.1.12-gsoap.patch +Patch23: VirtualBox-OSE-4.1.10-mesa.patch #Patch24: VirtualBox-4.1.20-x113.patch %if 0%{?fedora} < 17 -BuildRequires: kBuild >= 0.1.98 +BuildRequires: kBuild >= 0.1.98 %endif -BuildRequires: SDL-devel xalan-c-devel -BuildRequires: openssl-devel -BuildRequires: libcurl-devel -BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel -BuildRequires: yasm -BuildRequires: pulseaudio-libs-devel -BuildRequires: python-devel -BuildRequires: desktop-file-utils -BuildRequires: libcap-devel -BuildRequires: qt4-devel -BuildRequires: gsoap-devel -BuildRequires: xz -BuildRequires: pam-devel -BuildRequires: mkisofs -BuildRequires: java-devel >= 1.6 -BuildRequires: /usr/bin/pdflatex -BuildRequires: libpng-devel +BuildRequires: SDL-devel xalan-c-devel +BuildRequires: openssl-devel +BuildRequires: libcurl-devel +BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel +BuildRequires: yasm +BuildRequires: pulseaudio-libs-devel +BuildRequires: python-devel +BuildRequires: desktop-file-utils +BuildRequires: libcap-devel +BuildRequires: qt4-devel +BuildRequires: gsoap-devel +BuildRequires: xz +BuildRequires: pam-devel +BuildRequires: mkisofs +BuildRequires: java-devel >= 1.6 +BuildRequires: /usr/bin/pdflatex +BuildRequires: libpng-devel +# libstdc++.i686 and libc-devel.i686 for 32-bits +BuildRequires: /usr/lib/libc.so +BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 # For the X11 module -BuildRequires: libdrm-devel -BuildRequires: libpciaccess-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libOSMesa-devel -BuildRequires: pixman-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-server-source -BuildRequires: xorg-x11-server-devel -BuildRequires: libXcursor-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXmu-devel +BuildRequires: libdrm-devel +BuildRequires: libpciaccess-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libOSMesa-devel +BuildRequires: pixman-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-server-source +BuildRequires: xorg-x11-server-devel +BuildRequires: libXcursor-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXmu-devel BuildRequires: systemd-units Requires(post): systemd-units @@ -86,20 +85,20 @@ # Plague-specific weirdness %if 0%{?fedora} > 11 || 0%{?rhel} > 5 -ExclusiveArch: i686 x86_64 +ExclusiveArch: i686 x86_64 %else %if 0%{?fedora} > 10 -ExclusiveArch: i586 x86_64 +ExclusiveArch: i586 x86_64 %else -ExclusiveArch: i386 x86_64 +ExclusiveArch: i386 x86_64 %endif -Provides: %{name}-OSE = %{version}-%{release} -Obsoletes: %{name}-OSE < %{version}-%{release} -Requires: %{name}-kmod = %{version}%{?prereltag} -Provides: %{name}-kmod-common = %{version}%{?prereltag} -Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} -Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} -Conflicts: %{name}-guest <= %{version}-%{release} +Provides: %{name}-OSE = %{version}-%{release} +Obsoletes: %{name}-OSE < %{version}-%{release} +Requires: %{name}-kmod = %{version}%{?prereltag} +Provides: %{name}-kmod-common = %{version}%{?prereltag} +Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} +Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} +Conflicts: %{name}-guest <= %{version}-%{release} %description A general-purpose full virtualizer and emulator for 32-bit and @@ -107,49 +106,49 @@ %package devel -Summary: %{name} SDK -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python-%{name} = %{version}-%{release} -Provides: %{name}-OSE-devel = %{version}-%{release} -Obsoletes: %{name}-OSE-devel < %{version}-%{release} +Summary: %{name} SDK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python-%{name} = %{version}-%{release} +Provides: %{name}-OSE-devel = %{version}-%{release} +Obsoletes: %{name}-OSE-devel < %{version}-%{release} %description devel %{name} Software Development Kit. %package -n python-%{name} -Summary: Python bindings for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Provides: python-%{name}-OSE = %{version}-%{release} -Obsoletes: python-%{name}-OSE < %{version}-%{release} +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Provides: python-%{name}-OSE = %{version}-%{release} +Obsoletes: python-%{name}-OSE < %{version}-%{release} %description -n python-%{name} Python XPCOM bindings to %{name}. %package guest -Summary: %{name} Guest Additions -Group: System Environment/Base -Provides: %{name}-OSE-guest = %{version}-%{release} -Obsoletes: %{name}-OSE-guest < %{version}-%{release} -Requires: %{name}-kmod = %{version} -Provides: %{name}-kmod-common = %{version} -Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} -Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-xinit -Provides: xorg-x11-drv-VirtualBox = %{version}-%{release} -Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release} -Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release} -Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release} +Summary: %{name} Guest Additions +Group: System Environment/Base +Provides: %{name}-OSE-guest = %{version}-%{release} +Obsoletes: %{name}-OSE-guest < %{version}-%{release} +Requires: %{name}-kmod = %{version} +Provides: %{name}-kmod-common = %{version} +Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} +Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} +Requires: xorg-x11-server-Xorg +Requires: xorg-x11-xinit +Provides: xorg-x11-drv-VirtualBox = %{version}-%{release} +Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release} +Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release} +Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release} %if "%(xserver-sdk-abi-requires 2>/dev/null)" -Requires: %(xserver-sdk-abi-requires ansic) -Requires: %(xserver-sdk-abi-requires videodrv) -Requires: %(xserver-sdk-abi-requires xinput) +Requires: %(xserver-sdk-abi-requires ansic) +Requires: %(xserver-sdk-abi-requires videodrv) +Requires: %(xserver-sdk-abi-requires xinput) %endif -Conflicts: %{name} <= %{version}-%{release} +Conflicts: %{name} <= %{version}-%{release} %description guest @@ -160,8 +159,8 @@ %package kmodsrc -Summary: %{name} kernel module source code -Group: System Environment/Kernel +Summary: %{name} kernel module source code +Group: System Environment/Kernel Provides: %{name}-OSE-kmodsrc = %{version}-%{release} Obsoletes: %{name}-OSE-kmodsrc < %{version}-%{release} @@ -178,13 +177,9 @@ %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 -%patch10 -p1 -b .32bit -#%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself -#%patch16 -p1 -b .usblib %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug -%patch20 -p1 -b .testmangle %if 0%{?fedora} < 16 %patch22 -p1 -b .gsoap %endif @@ -216,13 +211,13 @@ # the installation paths, but install the tree with the default # layout under 'obj' and shuffle files around in %%install. kmk %{_smp_mflags} \ - KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \ - VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \ - VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ - VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \ - VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \ - VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ - VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ + KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \ + VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \ + VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ + VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \ + VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \ + VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ + VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \ | sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom} @@ -266,68 +261,68 @@ ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/VBoxTunctl \ + obj/bin/VBoxTunctl \ # Components install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \ - obj/bin/components/* + obj/bin/components/* # Lib install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/*.so + obj/bin/*.so install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/V*.gc \ - obj/bin/V*.r0 \ - obj/bin/VBoxEFI*.fd + obj/bin/V*.gc \ + obj/bin/V*.r0 \ + obj/bin/VBoxEFI*.fd # Documentation install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/UserManual.pdf + obj/bin/UserManual.pdf # Executables install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/VBoxHeadless \ - obj/bin/VBoxSDL \ - obj/bin/VBoxNetDHCP \ - obj/bin/VBoxNetAdpCtl \ - obj/bin/VirtualBox \ - obj/bin/VBoxManage \ - obj/bin/VBoxSVC \ - obj/bin/VBoxXPCOMIPCD \ - obj/bin/VBoxSysInfo.sh \ - obj/bin/vboxshell.py \ - obj/bin/VBoxTestOGL \ - obj/bin/VBoxExtPackHelperApp \ - obj/bin/vboxwebsrv \ - obj/bin/VBoxBalloonCtrl \ - obj/bin/webtest \ - obj/bin/VBoxBFE + obj/bin/VBoxHeadless \ + obj/bin/VBoxSDL \ + obj/bin/VBoxNetDHCP \ + obj/bin/VBoxNetAdpCtl \ + obj/bin/VirtualBox \ + obj/bin/VBoxManage \ + obj/bin/VBoxSVC \ + obj/bin/VBoxXPCOMIPCD \ + obj/bin/VBoxSysInfo.sh \ + obj/bin/vboxshell.py \ + obj/bin/VBoxTestOGL \ + obj/bin/VBoxExtPackHelperApp \ + obj/bin/vboxwebsrv \ + obj/bin/VBoxBalloonCtrl \ + obj/bin/webtest \ + obj/bin/VBoxBFE # Language files install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \ - obj/bin/nls/* + obj/bin/nls/* # SDK pushd obj/bin/sdk/installer VBOX_INSTALL_PATH=%{_libdir}/virtualbox \ - python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT + python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT popd cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer # Icons install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \ - obj/bin/VBox.png + obj/bin/VBox.png #ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png for S in obj/bin/icons/* do - SIZE=$(basename $S) - install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps} - install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes - [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png + SIZE=$(basename $S) + install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps} + install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes + [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png done install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages @@ -338,51 +333,51 @@ %global x11_api 17 install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so + $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so + $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so # Guest tools -install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ - obj/bin/additions/mount.vboxsf +install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ + obj/bin/additions/mount.vboxsf -install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/additions/VBoxService \ - obj/bin/additions/VBoxClient \ - obj/bin/additions/VBoxControl +install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ + obj/bin/additions/VBoxService \ + obj/bin/additions/VBoxClient \ + obj/bin/additions/VBoxControl # Ideally, Xorg should autodetect this, but for some reason it no longer does install -m 0644 -D %{SOURCE9} \ - $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf + $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf install -m 0644 -D %{SOURCE10} \ - $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service + $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service install -m 0644 -D %{SOURCE11} \ - $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service + $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \ - $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh + $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh + $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \ - $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop + $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop install -m 0644 -D %{SOURCE8} \ - $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop + $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop # Guest libraries -install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \ - obj/bin/additions/VBoxOGL*.so +install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \ + obj/bin/additions/VBoxOGL*.so ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \ - obj/bin/additions/pam_vbox.so + obj/bin/additions/pam_vbox.so # Installation root configuration install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox @@ -401,12 +396,12 @@ cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version} install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version} tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \ - %{name}-kmod-%{version} + %{name}-kmod-%{version} # Menu entry desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --remove-key=DocPath --remove-category=X-MandrivaLinux-System \ - --vendor='' obj/bin/virtualbox.desktop + --remove-key=DocPath --remove-category=X-MandrivaLinux-System \ + --vendor='' obj/bin/virtualbox.desktop %post # Group for USB devices @@ -425,8 +420,8 @@ # Assign USB devices if /sbin/udevadm control --reload-rules >/dev/null 2>&1 then -# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || : -# /sbin/udevadm settle >/dev/null 2>&1 || : +# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || : +# /sbin/udevadm settle >/dev/null 2>&1 || : systemctl restart udev-trigger.service systemctl restart udev-settle.service fi @@ -555,6 +550,23 @@ %changelog +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC3 +- vim :retab, reformat all tabs. +- add BR # libstdc++.i686 and libc-devel.i686 for 32-bits +BuildRequires: /usr/lib/libc.so +BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 +- drop 32-bit patch and testmangle patch, no fails. +- rename and remove some patches +cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available +cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available +cvs diff: VirtualBox-4.2.0-libcxx.patch is a new entry, no comparison available +cvs diff: VirtualBox-4.2.0-xorg17.patch is a new entry, no comparison available +cvs diff: VirtualBox-OSE-3.2.0-visibility.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.0.0-32bit.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.1.2-testmangle.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.1.2-usblib.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available + * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3 - New major release, devel release of rpms . - rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch --- VirtualBox-4.1.20-libcxx.patch DELETED --- --- VirtualBox-OSE-3.2.0-visibility.patch DELETED --- --- VirtualBox-OSE-4.0.0-32bit.patch DELETED --- --- VirtualBox-OSE-4.1.2-testmangle.patch DELETED --- --- VirtualBox-OSE-4.1.2-usblib.patch DELETED --- --- VirtualBox-OSE-4.1.4-xorg17.patch DELETED ---

11 years, 7 months

1
0
0 / 0

rpms/VirtualBox/devel VirtualBox.modules, NONE, 1.1 VirtualBox-4.1.20-libcxx.patch, 1.1, 1.2 VirtualBox-OSE-4.0.0-32bit.patch, 1.1, 1.2 VirtualBox-OSE-4.1.4-xorg17.patch, 1.2, 1.3 VirtualBox.spec, 1.15, 1.16

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13384 Modified Files: VirtualBox-4.1.20-libcxx.patch VirtualBox-OSE-4.0.0-32bit.patch VirtualBox-OSE-4.1.4-xorg17.patch VirtualBox.spec Added Files: VirtualBox.modules Log Message: * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3 - New major release, devel release of rpms . - rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch and VirtualBox-OSE-4.0.0-32bit.patch --- NEW FILE VirtualBox.modules --- #!/bin/sh # User is advised to run this on upgrades /sbin/modprobe -r -b vboxnetflt &>/dev/null ||: /sbin/modprobe -r -b vboxnetadp &>/dev/null ||: /sbin/modprobe -r -b vboxdrv &>/dev/null ||: # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxdrv insert_module vboxnetflt insert_module vboxnetadp VirtualBox-4.1.20-libcxx.patch: Config.kmk | 4 ++-- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 20 insertions(+), 23 deletions(-) Index: VirtualBox-4.1.20-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.20-libcxx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-4.1.20-libcxx.patch 1 Sep 2012 20:00:37 -0000 1.1 +++ VirtualBox-4.1.20-libcxx.patch 3 Sep 2012 01:28:08 -0000 1.2 @@ -1,13 +1,3 @@ -From: Lubomir Rintel <lkundrak(a)v3.sk> -Date: Fri, 14 May 2010 12:26:33 +0200 -Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer. - -Seems like this patch could be safely left out. -removes -g -pipe ---- - Config.kmk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 18 Jun 2010 10:58:14 +0200 @@ -56,15 +46,6 @@ TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) -@@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI - $(LIB_SDL_INC) - ## @todo Use VBOX_GCC_PEDANTIC_CXX? - TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \ -- -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ -+ $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ - -Wno-long-long -fshort-wchar -fno-strict-aliasing \ - $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \ - $(VBOX_GCC_Wno-delete-non-virtual-dtor) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure @@ -78,28 +59,23 @@ if [ $WITH_KMODS -eq 1 ]; then check_linux else -diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk -index 52fb6d3..af7ba4b 100644 ---- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk -+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk -@@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM +--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 ++++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk 2012-09-02 02:55:41.970453638 +0100 +@@ -195,7 +195,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE + vbvdbg_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH) vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ - wddm/dbg/VBoxVideoWinDbg.cpp \ -diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk -index ee73ed0..e359702 100644 ---- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk -+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk -@@ -50,10 +50,7 @@ VBoxClient_LIBS = \ - X11 \ - Xrandr \ +--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 ++++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2012-09-02 03:13:43.602348048 +0100 +@@ -49,9 +49,7 @@ VBoxClient_LIBS = \ Xt --# These are static replacements for gcc-specific parts of libstdc++ + # Xtst + # These are static replacements for gcc-specific parts of libstdc++ -VBoxClient_LIBS += \ - supc++ \ - gcc_eh @@ -120,11 +96,9 @@ VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL -diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk -index bf77085..9d67f49 100644 ---- a/src/VBox/HostDrivers/Support/Makefile.kmk -+++ b/src/VBox/HostDrivers/Support/Makefile.kmk -@@ -95,7 +95,7 @@ SUPR3_SOURCES = \ +--- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100 ++++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100 +@@ -94,7 +94,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # @@ -134,82 +108,77 @@ # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -index a40f46d..e29273f 100644 ---- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -@@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100 ++++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100 +@@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE - WinNetConfig_SDKS = WINPSDK W2K3DDK + WinNetConfig_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) WinNetConfig_SOURCES = \ -@@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -154,7 +154,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE - NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetFltInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ -@@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -169,7 +169,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE - NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetFltUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ -@@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -183,7 +183,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE - NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetAdpInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ -@@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -198,7 +198,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE - NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetAdpUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ -@@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -212,7 +212,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) - VBoxNetFltNobj_NOINST = true - endif -diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk -index 19c15d5..6d2366f 100644 ---- a/src/VBox/HostDrivers/win/Makefile.kmk -+++ b/src/VBox/HostDrivers/win/Makefile.kmk + VBoxNetFltNobj_INSTTYPE = none + VBoxNetFltNobj_DEBUG_INSTTYPE = both +--- a/src/VBox/HostDrivers/win/Makefile.kmk.libcxx 2012-07-18 09:58:10.000000000 +0100 ++++ b/src/VBox/HostDrivers/win/Makefile.kmk 2012-09-02 02:39:16.639533050 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE - VBoxDrvCfg_SDKS = WINPSDK W2K3DDK + VBoxDrvCfg_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp -diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk -index 5271e49..aa18e57 100644 ---- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk -+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk +--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk.libcxx 2012-08-03 13:28:30.000000000 +0100 ++++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk 2012-09-02 02:59:34.062788499 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. - include $(KBUILD_PATH)/subheader.kmk + include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC @@ -217,12 +186,10 @@ VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) -diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk -index 77ea1b7..5e58fdc 100644 ---- a/src/VBox/Installer/win/Resources/Makefile.kmk -+++ b/src/VBox/Installer/win/Resources/Makefile.kmk +--- a/src/VBox/Installer/win/Resources/Makefile.kmk.libcxx 2012-05-30 11:38:23.000000000 +0100 ++++ b/src/VBox/Installer/win/Resources/Makefile.kmk 2012-09-02 02:57:56.559807746 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. - include $(KBUILD_PATH)/subheader.kmk + include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC @@ -284,4 +251,3 @@ -- 1.7.1 - VirtualBox-OSE-4.0.0-32bit.patch: configure | 2 +- src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) Index: VirtualBox-OSE-4.0.0-32bit.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.0.0-32bit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-OSE-4.0.0-32bit.patch 3 Feb 2011 23:25:21 -0000 1.1 +++ VirtualBox-OSE-4.0.0-32bit.patch 3 Sep 2012 01:28:08 -0000 1.2 @@ -67,26 +67,24 @@ tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSize_INCS = \ -diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk -index f947789..95882f1 100644 ---- a/src/VBox/VMM/testcase/Makefile.kmk -+++ b/src/VBox/VMM/testcase/Makefile.kmk -@@ -21,10 +21,14 @@ include $(KBUILD_PATH)/subheader.kmk +--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100 ++++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100 +@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk # # Target lists. # +-PROGRAMS += tstVMStructSize tstAsmStructs +-ifdef VBOX_WITH_RAW_MODE +- PROGRAMS += tstVMStructRC tstAsmStructsRC +ifneq ($(KBUILD_HOST_ARCH),amd64) - PROGRAMS += tstVMStructSize tstAsmStructs -+endif - ifdef VBOX_WITH_RAW_MODE -+ifneq ($(KBUILD_HOST_ARCH),amd64) - PROGRAMS += tstVMStructRC tstAsmStructsRC ++ PROGRAMS += tstVMStructSize tstAsmStructs ++ ifdef VBOX_WITH_RAW_MODE ++ PROGRAMS += tstVMStructRC tstAsmStructsRC ++ endif endif -+endif - ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS - PROGRAMS += tstGlobalConfig tstInstrEmul - ifdef VBOX_WITH_RAW_MODE -@@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) + if !defined(VBOX_ONLY_EXTPACKS) \ + && ( defined(VBOX_WITH_DTRACE_R3) \ +@@ -77,16 +79,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) # ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) @@ -108,6 +106,3 @@ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run --- -1.7.3.4 - VirtualBox-OSE-4.1.4-xorg17.patch: b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 ++--- b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 15 +++++- b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 40 +++++++++++++++++ src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 - 4 files changed, 60 insertions(+), 13 deletions(-) Index: VirtualBox-OSE-4.1.4-xorg17.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.1.4-xorg17.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-OSE-4.1.4-xorg17.patch 15 Jan 2012 00:33:09 -0000 1.2 +++ VirtualBox-OSE-4.1.4-xorg17.patch 3 Sep 2012 01:28:08 -0000 1.3 @@ -27,61 +27,42 @@ VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -@@ -53,9 +53,18 @@ - mouse.c \ - pnp.c \ - VBoxUtils_68.c +--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100 ++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-02 23:44:33.878251237 +0100 +@@ -57,9 +57,18 @@ if1of ($(KBUILD_TARGET), linux) + vboxmouse_drv_POST_CMDS = \ + objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \ + $(MV) -f $(out)-objcopy $(out) -endif - +DLLS += vboxmouse_drv_17 +vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD +vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \ -+ NO_ANSIC ++ DONT_DEFINE_WRAPPERS NO_ANSIC +vboxmouse_drv_17_INCS := \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 -+vboxmouse_drv_17 = \ -+ vboxmouse_15.c ++vboxmouse_drv_17_SOURCES = \ ++ vboxmouse.c +else # # vboxmouse_drv_70 # -@@ -154,7 +166,6 @@ - vboxmouse_15.c +@@ -391,5 +398,7 @@ endif # neq ($(KBUILD_TARGET),linux) + # endif # ! VBOX_ONLY_ADDITIONS + endif # VBOX_WITH_TESTCASES - --ifneq ($(KBUILD_TARGET), linux) - - # - # vboxmouse_drv_17 -@@ -256,6 +267,8 @@ - $(QUIET)$(APPEND) -t "$@" "done" - endif - -+ifneq ($(KBUILD_TARGET), linux) ++endif # neq ($(KBUILD_TARGET),linux) + - TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run - OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run - $$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(vboxmouse_drv_70_1_STAGE_TARGET) -@@ -304,8 +317,6 @@ - $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15 - $(QUIET)$(APPEND) -t "$@" "done" + include $(FILE_KBUILD_SUB_FOOTER) --ifneq ($(KBUILD_TARGET), linux) -- - TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run - OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run - $$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET) ---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2011-12-19 12:58:57.000000000 +0000 -+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-01-12 03:47:06.381765975 +0000 -@@ -88,6 +88,42 @@ vboxvideo_drv_SOURCES = \ - $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \ - $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp +--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100 ++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-03 00:00:13.988618277 +0100 +@@ -94,6 +94,44 @@ vboxvideo_drv_SOURCES = \ + objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \ + $(MV) -f $(out)-objcopy $(out) +DLLS += vboxvideo_drv_17 +vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD @@ -118,18 +99,19 @@ +vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include +vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES) edid.c vboxvideo_dri.c + -+ifdef NOT_FEDORA_VBOX_WITH_TESTCASES - ++ifdef NOT_FEDORA ++ ++ # # vboxvideo_drv_70 -@@ -354,7 +390,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo + # +@@ -505,4 +543,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi + # endif # ! VBOX_ONLY_ADDITIONS + endif # VBOX_WITH_TESTCASES - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. --ifdef VBOX_WITH_TESTCASES - # ifndef VBOX_ONLY_ADDITIONS - if1of ($(KBUILD_TARGET),linux solaris) - ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) ++endif # NOT_FEDORA ++ + include $(FILE_KBUILD_SUB_FOOTER) --- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000 +++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000 @@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- VirtualBox.spec 1 Sep 2012 20:00:39 -0000 1.15 +++ VirtualBox.spec 3 Sep 2012 01:28:08 -0000 1.16 @@ -10,12 +10,12 @@ # major version number, while the kernel module abi is not guarranteed # to be stable. This is so that we force the module update in sync with # userspace. -#global prerel beta3 +%global prerel RC3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox -Version: 4.1.20 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Version: 4.2.0 +Release: 0.1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -37,12 +37,13 @@ Patch10: VirtualBox-OSE-4.0.0-32bit.patch #Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch -Patch16: VirtualBox-OSE-4.1.2-usblib.patch +#Patch16: VirtualBox-OSE-4.1.2-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch20: VirtualBox-OSE-4.1.2-testmangle.patch Patch22: VirtualBox-OSE-4.1.12-gsoap.patch Patch23: VirtualBox-OSE-4.1.10-mesa.patch +#Patch24: VirtualBox-4.1.20-x113.patch %if 0%{?fedora} < 17 BuildRequires: kBuild >= 0.1.98 @@ -170,7 +171,7 @@ %prep -%setup -q +%setup -qn %{name}-%{version}%{prereltag} find -name '*.py[co]' -delete %patch1 -p1 -b .noupdates @@ -180,7 +181,7 @@ %patch10 -p1 -b .32bit #%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself -%patch16 -p1 -b .usblib +#%patch16 -p1 -b .usblib %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug %patch20 -p1 -b .testmangle @@ -190,6 +191,9 @@ %if 0%{?fedora} > 16 %patch23 -p1 -b .mesa %endif +#%if 0%{?fedora} > 17 +#%patch24 -p1 -b .x113 +#%endif # Remove prebuilt binary tools %if 0%{?fedora} < 17 @@ -202,7 +206,8 @@ %build -./configure --disable-kmods --enable-webservice +./configure --disable-kmods --enable-webservice +#--disable-java . ./env.sh # VirtualBox build system installs and builds in the same step, @@ -550,6 +555,11 @@ %changelog +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3 +- New major release, devel release of rpms . +- rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch + and VirtualBox-OSE-4.0.0-32bit.patch + * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch

11 years, 7 months

1
0
0 / 0

rpms/dvbcut/F-18 dvbcut-179-vs-ubuntu-12.04.diff, NONE, 1.1 dvbcut-svn179-ffmpeg-0.11.1.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dvbcut.spec, 1.18, 1.19 sources, 1.6, 1.7 dvbcut-ffmpeg-0.8.2.patch, 1.1, NONE dvbcut-gcc47.patch, 1.1, NONE

by David Timms

Author: dtimms Update of /cvs/free/rpms/dvbcut/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3255 Modified Files: .cvsignore dvbcut.spec sources Added Files: dvbcut-179-vs-ubuntu-12.04.diff dvbcut-svn179-ffmpeg-0.11.1.patch Removed Files: dvbcut-ffmpeg-0.8.2.patch dvbcut-gcc47.patch Log Message: drop upstreamed gcc47 patch add ffmpeg-0.10.4 patch dvbcut-179-vs-ubuntu-12.04.diff from Olaf Dietsche drop ffmpeg-0.8.2 patch superseded by ffmpeg-0.10.4 patch add ffmpeg-0.11.1 patch modify kde service install from desktop-file-install to copy. dvbcut-179-vs-ubuntu-12.04.diff: lavfmuxer.cpp | 24 ++++++++++++++++-------- lavfmuxer.h | 2 +- mpgfile.cpp | 30 ++++++++++++++++++++---------- 3 files changed, 37 insertions(+), 19 deletions(-) --- NEW FILE dvbcut-179-vs-ubuntu-12.04.diff --- Index: src/lavfmuxer.h =================================================================== --- src/lavfmuxer.h (revision 179) +++ src/lavfmuxer.h (working copy) @@ -73,7 +73,7 @@ avp.dts=dts; avp.stream_index=st[str].stream_index; if (flags & MUXER_FLAG_KEY) - avp.flags |= PKT_FLAG_KEY; + avp.flags |= AV_PKT_FLAG_KEY; int rv=av_interleaved_write_frame(avfc,&avp); Index: src/mpgfile.cpp =================================================================== --- src/mpgfile.cpp (revision 179) +++ src/mpgfile.cpp (working copy) @@ -154,15 +154,19 @@ if (!firstsequence || idx[streampic].getsequencenumber()>=seqnr) { - const uint8_t *data=(const uint8_t*)sd->getdata(); + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = (uint8_t*)sd->getdata(); + avpkt.size = bytes; + // HACK for CorePNG to decode as normal PNG by default + avpkt.flags = AV_PKT_FLAG_KEY; int frameFinished=0; - int decodebytes=bytes; - while (decodebytes>0) + while (avpkt.size>0) { frameFinished=0; - int bytesDecoded=avcodec_decode_video(S->avcc, avf, &frameFinished, - (uint8_t*) data, decodebytes); + int bytesDecoded=avcodec_decode_video2(S->avcc, avf, &frameFinished, + &avpkt); if (bytesDecoded<0) { fprintf(stderr,"libavcodec error while decoding frame #%d\n",pic); @@ -170,8 +174,8 @@ return; } - data+=bytesDecoded; - decodebytes-=bytesDecoded; + avpkt.data+=bytesDecoded; + avpkt.size-=bytesDecoded; if (frameFinished) { @@ -184,7 +188,7 @@ if (pic>=stop) { frameFinished=0; - decodebytes=0; + avpkt.size=0; break; } } @@ -200,8 +204,14 @@ if (pic < stop) { + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = NULL; + avpkt.size = 0; + // HACK for CorePNG to decode as normal PNG by default + avpkt.flags = AV_PKT_FLAG_KEY; int frameFinished=0; - avcodec_decode_video(S->avcc, avf, &frameFinished, NULL, 0); + avcodec_decode_video2(S->avcc, avf, &frameFinished, &avpkt); if (frameFinished) { if (last_cpn!=avf->coded_picture_number) @@ -248,7 +258,7 @@ stream *S=&s[VIDEOSTREAM]; S->id=vid; S->allocavcc(); - S->avcc->codec_type=CODEC_TYPE_VIDEO; + S->avcc->codec_type=AVMEDIA_TYPE_VIDEO; S->avcc->codec_id=CODEC_ID_MPEG2VIDEO; S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO); S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO); Index: src/lavfmuxer.cpp =================================================================== --- src/lavfmuxer.cpp (revision 179) +++ src/lavfmuxer.cpp (working copy) @@ -34,12 +34,12 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg, const char *filename) : muxer(), avfc(0), fileopened(false) { - fmt = guess_format(format, NULL, NULL); + fmt = av_guess_format(format, NULL, NULL); if (!fmt) { return; } - avfc=av_alloc_format_context(); + avfc=avformat_alloc_context(); if (!avfc) return; @@ -73,7 +73,7 @@ av_free(s->codec); s->codec = avcodec_alloc_context(); avcodec_get_context_defaults(s->codec); - s->codec->codec_type=CODEC_TYPE_AUDIO; + s->codec->codec_type=AVMEDIA_TYPE_AUDIO; s->codec->codec_id = (mpg.getstreamtype(astr)==streamtype::ac3audio) ? CODEC_ID_AC3 : CODEC_ID_MP2; s->codec->rc_buffer_size = 224*1024*8; @@ -92,13 +92,21 @@ int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE/sizeof(int16_t)]; int frame_size=sizeof(samples); //fprintf(stderr, "** decode audio size=%d\n", sd->inbytes()); -#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0) - avcodec_decode_audio2 +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = (uint8_t*)sd->getdata(); + avpkt.size = sd->inbytes(); + // HACK for CorePNG to decode as normal PNG by default + avpkt.flags = AV_PKT_FLAG_KEY; + avcodec_decode_audio3(s->codec,samples,&frame_size, &avpkt); +#elif LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0) + avcodec_decode_audio2(s->codec,samples,&frame_size, + (uint8_t*) sd->getdata(),sd->inbytes()); #else - avcodec_decode_audio + avcodec_decode_audio(s->codec,samples,&frame_size, + (uint8_t*) sd->getdata(),sd->inbytes()); #endif - (s->codec,samples,&frame_size, - (uint8_t*) sd->getdata(),sd->inbytes()); avcodec_close(s->codec); } break; dvbcut-svn179-ffmpeg-0.11.1.patch: lavfmuxer.cpp | 34 ++++++++++++++++++++++++++++++---- mpgfile.cpp | 5 ++++- mpgfile.cpp~ |only 3 files changed, 34 insertions(+), 5 deletions(-) --- NEW FILE dvbcut-svn179-ffmpeg-0.11.1.patch --- diff -ur dvbcut.orig/src/lavfmuxer.cpp dvbcut/src/lavfmuxer.cpp --- dvbcut.orig/src/lavfmuxer.cpp 2012-08-31 23:28:42.000000000 +1000 +++ dvbcut/src/lavfmuxer.cpp 2012-09-01 12:12:04.472248687 +1000 @@ -43,9 +43,16 @@ if (!avfc) return; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) +// todo: what here ? +// maybe: AVFormatContext::audio_preload but no direct access. +// AVOptions +// iformat +#else avfc->preload= (int)(.5*AV_TIME_BASE); - avfc->max_delay= (int)(.7*AV_TIME_BASE); avfc->mux_rate=10080000; +#endif + avfc->max_delay= (int)(.7*AV_TIME_BASE); avfc->oformat=fmt; strncpy(avfc->filename, filename, sizeof(avfc->filename)); @@ -114,19 +121,36 @@ } } +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + // error: 'av_set_parameters' was not declared in this scope + if (!(fmt->flags & AVFMT_NOFILE)&&(avio_open(&avfc->pb, filename, AVIO_FLAG_WRITE) < 0)) { +#else if ((av_set_parameters(avfc, NULL) < 0) || (!(fmt->flags & AVFMT_NOFILE)&&(url_fopen(&avfc->pb, filename, URL_WRONLY) < 0))) { +#endif av_free(avfc); avfc=0; return; } +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) +// todo: what here ? +// maybe: AVFormatContext::audio_preload but no direct access. +// AVOptions +// iformat +#else avfc->preload= (int)(.5*AV_TIME_BASE); - avfc->max_delay= (int)(.7*AV_TIME_BASE); avfc->mux_rate=10080000; +#endif + avfc->max_delay= (int)(.7*AV_TIME_BASE); - +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + av_dump_format(avfc, 0, filename, 1); + fileopened=true; + avformat_write_header(avfc, NULL); +#else dump_format(avfc, 0, filename, 1); fileopened=true; av_write_header(avfc); +#endif } @@ -136,7 +160,9 @@ if (fileopened) { av_write_trailer(avfc); if (!(fmt->flags & AVFMT_NOFILE)) -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + avio_close(avfc->pb); +#elif LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) url_fclose(avfc->pb); #else url_fclose(&avfc->pb); diff -ur dvbcut.orig/src/mpgfile.cpp dvbcut/src/mpgfile.cpp --- dvbcut.orig/src/mpgfile.cpp 2012-09-01 12:26:19.000000000 +1000 +++ dvbcut/src/mpgfile.cpp 2012-09-01 12:49:57.133541130 +1000 @@ -733,8 +733,11 @@ f->pts=idx[idx.indexnr(start+p)].getpts()-startpts; f->coded_picture_number=f->display_picture_number=p; f->key_frame=(p==0)?1:0; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + f->pict_type=(p==0)?AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; +#else f->pict_type=(p==0)?FF_I_TYPE:FF_P_TYPE; - +#endif out = avcodec_encode_video(avcc, buf, m2v.getsize(), f); Only in dvbcut/src: mpgfile.cpp~ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-18/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 Sep 2011 14:07:28 -0000 1.6 +++ .cvsignore 2 Sep 2012 22:28:56 -0000 1.7 @@ -1 +1 @@ -dvbcut-svn178.tar.bz2 +dvbcut-svn179.tar.bz2 Index: dvbcut.spec =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-18/dvbcut.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dvbcut.spec 26 Jun 2012 09:06:25 -0000 1.18 +++ dvbcut.spec 2 Sep 2012 22:28:56 -0000 1.19 @@ -1,4 +1,4 @@ -%define svnrev 178 +%define svnrev 179 %if 0%{?fedora} > 6 || 0%{?rhel} > 5 %define qt3 qt3 %else @@ -7,7 +7,7 @@ Name: dvbcut Version: 0.6.1 -Release: 6.svn%{svnrev}%{?dist} +Release: 7.svn%{svnrev}%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia @@ -28,8 +28,8 @@ Patch1: %{name}-svn176-fix-make-install.patch Patch2: %{name}-svn176-fix-help-install-path.patch Patch3: %{name}-svn176-desktop-additions.patch -Patch4: %{name}-ffmpeg-0.8.2.patch -Patch5: dvbcut-gcc47.patch +Patch6: %{name}-179-vs-ubuntu-12.04.diff +Patch7: %{name}-svn179-ffmpeg-0.11.1.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -64,8 +64,8 @@ %patch1 -b .fix-make-install %patch2 -b .fix-help-install %patch3 -b .desktop-improvements -%patch4 -b .ffmpeg -%patch5 -p1 -b .gcc47 +%patch6 -b .orig +%patch7 -p1 -b .orig # Fix QTDIR libs in configure sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in @@ -96,11 +96,9 @@ desktop-file-install --vendor="" \ --dir %{buildroot}%{_datadir}/applications dvbcut.desktop -#in future: % {_kde4_servicesdir}, but for now mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ -desktop-file-install \ - --dir=%{buildroot}%{_kde4_datadir}/kde4/services \ - %{SOURCE6} +cp %{SOURCE6} %{buildroot}%{_kde4_datadir}/kde4/services/ + %clean rm -rf %{buildroot} @@ -137,6 +135,13 @@ %changelog +* Wed Aug 29 2012 David Timms <iinet.net.au at dtimms> - 0.6.1-7.svn179 +- drop upstreamed gcc47 patch +- add ffmpeg-0.10.4 patch dvbcut-179-vs-ubuntu-12.04.diff from Olaf Dietsche +- drop ffmpeg-0.8.2 patch superseded by ffmpeg-0.10.4 patch +- add ffmpeg-0.11.1 patch +- modify kde service install from desktop-file-install to copy. + * Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.1-6.svn178 - Rebuilt for FFmpeg Index: sources =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-18/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Sep 2011 14:07:29 -0000 1.6 +++ sources 2 Sep 2012 22:28:56 -0000 1.7 @@ -1 +1 @@ -92baf7f9d86f35805519117fb8e04357 dvbcut-svn178.tar.bz2 +467975975bc7bf6abcb559449e776654 dvbcut-svn179.tar.bz2 --- dvbcut-ffmpeg-0.8.2.patch DELETED --- --- dvbcut-gcc47.patch DELETED ---

11 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2012