rpms/F-12 - New directory
by Xavier Lamien
Author: laxathom
Update of /cvs/free/rpms/F-12
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/tmpcvsF21079/rpms/F-12
Log Message:
Directory /cvs/free/rpms/F-12 added to the repository
15 years
rpms/realcrypt/F-10 realcrypt-6.3-rebranding.patch, 1.1, 1.2 realcrypt.spec, 1.2, 1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/realcrypt/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15775
Modified Files:
realcrypt-6.3-rebranding.patch realcrypt.spec
Log Message:
* Fri Nov 20 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-2
- fix rebranding patch
realcrypt-6.3-rebranding.patch:
Index: realcrypt-6.3-rebranding.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/realcrypt-6.3-rebranding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-6.3-rebranding.patch 1 Nov 2009 17:58:03 -0000 1.1
+++ realcrypt-6.3-rebranding.patch 20 Nov 2009 01:54:39 -0000 1.2
@@ -1,5 +1,5 @@
---- truecrypt-6.3-source/Common/Language.xml
-+++ truecrypt-6.3-source/Common/Language.xml.new
+--- truecrypt-6.3-source.orig/Common/Language.xml
++++ truecrypt-6.3-source/Common/Language.xml
@@ -12,20 +12,20 @@
<control lang="en" key="IDCANCEL">Cancel</control>
<control lang="en" key="IDC_ALL_USERS">Install &for all users</control>
@@ -1071,8 +1071,8 @@
<string lang="en" key="TEST">Test</string>
<string lang="en" key="KEYFILE">Keyfile</string>
<string lang="en" key="VOLUME_LABEL">Name</string>
---- truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp
-+++ truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp.new
+--- truecrypt-6.3-source.orig/Core/Unix/Linux/CoreLinux.cpp
++++ truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp
@@ -113,7 +113,7 @@
{
string devPath = mountedVolume->VirtualDevice;
@@ -1091,8 +1091,8 @@
if (nativeDevCount != cipherCount - 1)
nativeDevName << "_" << cipherCount - nativeDevCount - 2;
---- truecrypt-6.3-source/Core/Unix/CoreUnix.cpp
-+++ truecrypt-6.3-source/Core/Unix/CoreUnix.cpp.new
+--- truecrypt-6.3-source.orig/Core/Unix/CoreUnix.cpp
++++ truecrypt-6.3-source/Core/Unix/CoreUnix.cpp
@@ -205,17 +205,17 @@
string CoreUnix::GetDefaultMountPointPrefix () const
@@ -1115,8 +1115,8 @@
}
uint64 CoreUnix::GetDeviceSize (const DevicePath &devicePath) const
---- truecrypt-6.3-source/Main/UserInterface.cpp
-+++ truecrypt-6.3-source/Main/UserInterface.cpp.new
+--- truecrypt-6.3-source.orig/Main/UserInterface.cpp
++++ truecrypt-6.3-source/Main/UserInterface.cpp
@@ -50,7 +50,7 @@
vector <int> osVersion = SystemInfo::GetVersion();
@@ -1222,8 +1222,8 @@
wxTextCtrl *textCtrl = new wxTextCtrl (&dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
textCtrl->SetFont (wxFont (wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Courier"));
---- truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp
-+++ truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/VolumePropertiesDialog.cpp
++++ truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp
@@ -69,7 +69,7 @@
AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"]);
@@ -1233,8 +1233,8 @@
{
#endif
AppendToList ("TOTAL_DATA_READ", Gui->SizeToString (volumeInfo.TotalDataRead));
---- truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp
-+++ truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/VolumeCreationWizard.cpp
++++ truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp
@@ -151,7 +151,7 @@
else if (SelectedVolumeType == VolumeType::Hidden)
{
@@ -1244,8 +1244,8 @@
freeSpaceText = StringFormatter (_("Maximum possible hidden volume size for this volume is {0}."), Gui->SizeToString (MaxHiddenVolumeSize));
}
else
---- truecrypt-6.3-source/Main/Application.h
-+++ truecrypt-6.3-source/Main/Application.h.new
+--- truecrypt-6.3-source.orig/Main/Application.h
++++ truecrypt-6.3-source/Main/Application.h
@@ -24,7 +24,7 @@
static DirectoryPath GetExecutableDirectory ();
static FilePath GetExecutablePath ();
@@ -1255,8 +1255,8 @@
static UserInterface *GetUserInterface () { return mUserInterface; }
static UserInterfaceType::Enum GetUserInterfaceType () { return mUserInterfaceType; }
static void Initialize (UserInterfaceType::Enum type);
---- truecrypt-6.3-source/Common/Tcdefs.h
-+++ truecrypt-6.3-source/Common/Tcdefs.h.new
+--- truecrypt-6.3-source.orig/Common/Tcdefs.h
++++ truecrypt-6.3-source/Common/Tcdefs.h
@@ -12,7 +12,7 @@
#ifndef TCDEFS_H
#define TCDEFS_H
@@ -1277,8 +1277,8 @@
enum
{
---- truecrypt-6.3-source/Main/Forms/AboutDialog.cpp
-+++ truecrypt-6.3-source/Main/Forms/AboutDialog.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/AboutDialog.cpp
++++ truecrypt-6.3-source/Main/Forms/AboutDialog.cpp
@@ -20,8 +20,8 @@
LogoBitmap->SetBitmap (Resources::GetTextualLogoBitmap());
@@ -1298,8 +1298,8 @@
+ L"A RPMfusion Release");
}
}
---- truecrypt-6.2a-source/Main/GraphicUserInterface.cpp 2008-07-04 11:52:18.000000000 -0700
-+++ truecrypt-6.2a-source/Main/GraphicUserInterface.cpp.new 2008-08-05 20:05:06.000000000 -0700
+--- truecrypt-6.2a-source.orig/Main/GraphicUserInterface.cpp
++++ truecrypt-6.2a-source/Main/GraphicUserInterface.cpp
@@ -823,7 +823,7 @@
#endif
wxLog::FlushActive();
@@ -1377,3 +1377,24 @@
#else
# error TC_RESOURCE_DIR undefined
#endif
+--- truecrypt-6.3-source.orig/Core/Unix/CoreService.cpp
++++ truecrypt-6.3-source/Core/Unix/CoreService.cpp
+@@ -341,7 +341,7 @@ namespace TrueCrypt
+
+ string appPath = request.ApplicationExecutablePath;
+ if (appPath.empty())
+- appPath = "truecrypt";
++ appPath = "realcrypt";
+
+ const char *args[] = { "sudo", "-S", "-p", "", appPath.c_str(), TC_CORE_SERVICE_CMDLINE_OPTION, nullptr };
+ execvp (args[0], ((char* const*) args));
--- truecrypt-6.3-source.orig/Core/Unix/CoreUnix.h
++++ truecrypt-6.3-source/Core/Unix/CoreUnix.h
+@@ -50,7 +50,7 @@ namespace TrueCrypt
+ virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); }
+ virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const;
+ virtual string GetDefaultMountPointPrefix () const;
+- virtual string GetFuseMountDirPrefix () const { return ".truecrypt_aux_mnt"; }
++ virtual string GetFuseMountDirPrefix () const { return ".realcrypt_aux_mnt"; }
+ virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0;
+ virtual uid_t GetRealUserId () const;
+ virtual gid_t GetRealGroupId () const;
Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-10/realcrypt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- realcrypt.spec 1 Nov 2009 17:53:39 -0000 1.2
+++ realcrypt.spec 20 Nov 2009 01:54:39 -0000 1.3
@@ -3,7 +3,7 @@
Name: realcrypt
Summary: Cross platform disk encryption software
Version: 6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: TrueCrypt License Version 2.8
Group: Applications/File
URL: http://www.truecrypt.org/
@@ -144,6 +144,9 @@
%changelog
+* Fri Nov 20 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-2
+- fix rebranding patch
+
* Sat Oct 31 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-1
- update to 6.3 and fix rebranding patches
15 years
rpms/realcrypt/devel realcrypt-6.3-rebranding.patch, 1.1, 1.2 realcrypt.spec, 1.3, 1.4
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/realcrypt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15647
Modified Files:
realcrypt-6.3-rebranding.patch realcrypt.spec
Log Message:
* Fri Nov 20 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-2
- fix rebranding patch
realcrypt-6.3-rebranding.patch:
Index: realcrypt-6.3-rebranding.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt-6.3-rebranding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-6.3-rebranding.patch 1 Nov 2009 17:45:34 -0000 1.1
+++ realcrypt-6.3-rebranding.patch 20 Nov 2009 01:52:50 -0000 1.2
@@ -1,5 +1,5 @@
---- truecrypt-6.3-source/Common/Language.xml
-+++ truecrypt-6.3-source/Common/Language.xml.new
+--- truecrypt-6.3-source.orig/Common/Language.xml
++++ truecrypt-6.3-source/Common/Language.xml
@@ -12,20 +12,20 @@
<control lang="en" key="IDCANCEL">Cancel</control>
<control lang="en" key="IDC_ALL_USERS">Install &for all users</control>
@@ -1071,8 +1071,8 @@
<string lang="en" key="TEST">Test</string>
<string lang="en" key="KEYFILE">Keyfile</string>
<string lang="en" key="VOLUME_LABEL">Name</string>
---- truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp
-+++ truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp.new
+--- truecrypt-6.3-source.orig/Core/Unix/Linux/CoreLinux.cpp
++++ truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp
@@ -113,7 +113,7 @@
{
string devPath = mountedVolume->VirtualDevice;
@@ -1091,8 +1091,8 @@
if (nativeDevCount != cipherCount - 1)
nativeDevName << "_" << cipherCount - nativeDevCount - 2;
---- truecrypt-6.3-source/Core/Unix/CoreUnix.cpp
-+++ truecrypt-6.3-source/Core/Unix/CoreUnix.cpp.new
+--- truecrypt-6.3-source.orig/Core/Unix/CoreUnix.cpp
++++ truecrypt-6.3-source/Core/Unix/CoreUnix.cpp
@@ -205,17 +205,17 @@
string CoreUnix::GetDefaultMountPointPrefix () const
@@ -1115,8 +1115,8 @@
}
uint64 CoreUnix::GetDeviceSize (const DevicePath &devicePath) const
---- truecrypt-6.3-source/Main/UserInterface.cpp
-+++ truecrypt-6.3-source/Main/UserInterface.cpp.new
+--- truecrypt-6.3-source.orig/Main/UserInterface.cpp
++++ truecrypt-6.3-source/Main/UserInterface.cpp
@@ -50,7 +50,7 @@
vector <int> osVersion = SystemInfo::GetVersion();
@@ -1222,8 +1222,8 @@
wxTextCtrl *textCtrl = new wxTextCtrl (&dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
textCtrl->SetFont (wxFont (wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Courier"));
---- truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp
-+++ truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/VolumePropertiesDialog.cpp
++++ truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp
@@ -69,7 +69,7 @@
AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"]);
@@ -1233,8 +1233,8 @@
{
#endif
AppendToList ("TOTAL_DATA_READ", Gui->SizeToString (volumeInfo.TotalDataRead));
---- truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp
-+++ truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/VolumeCreationWizard.cpp
++++ truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp
@@ -151,7 +151,7 @@
else if (SelectedVolumeType == VolumeType::Hidden)
{
@@ -1244,8 +1244,8 @@
freeSpaceText = StringFormatter (_("Maximum possible hidden volume size for this volume is {0}."), Gui->SizeToString (MaxHiddenVolumeSize));
}
else
---- truecrypt-6.3-source/Main/Application.h
-+++ truecrypt-6.3-source/Main/Application.h.new
+--- truecrypt-6.3-source.orig/Main/Application.h
++++ truecrypt-6.3-source/Main/Application.h
@@ -24,7 +24,7 @@
static DirectoryPath GetExecutableDirectory ();
static FilePath GetExecutablePath ();
@@ -1255,8 +1255,8 @@
static UserInterface *GetUserInterface () { return mUserInterface; }
static UserInterfaceType::Enum GetUserInterfaceType () { return mUserInterfaceType; }
static void Initialize (UserInterfaceType::Enum type);
---- truecrypt-6.3-source/Common/Tcdefs.h
-+++ truecrypt-6.3-source/Common/Tcdefs.h.new
+--- truecrypt-6.3-source.orig/Common/Tcdefs.h
++++ truecrypt-6.3-source/Common/Tcdefs.h
@@ -12,7 +12,7 @@
#ifndef TCDEFS_H
#define TCDEFS_H
@@ -1277,8 +1277,8 @@
enum
{
---- truecrypt-6.3-source/Main/Forms/AboutDialog.cpp
-+++ truecrypt-6.3-source/Main/Forms/AboutDialog.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/AboutDialog.cpp
++++ truecrypt-6.3-source/Main/Forms/AboutDialog.cpp
@@ -20,8 +20,8 @@
LogoBitmap->SetBitmap (Resources::GetTextualLogoBitmap());
@@ -1298,8 +1298,8 @@
+ L"A RPMfusion Release");
}
}
---- truecrypt-6.2a-source/Main/GraphicUserInterface.cpp 2008-07-04 11:52:18.000000000 -0700
-+++ truecrypt-6.2a-source/Main/GraphicUserInterface.cpp.new 2008-08-05 20:05:06.000000000 -0700
+--- truecrypt-6.2a-source.orig/Main/GraphicUserInterface.cpp
++++ truecrypt-6.2a-source/Main/GraphicUserInterface.cpp
@@ -823,7 +823,7 @@
#endif
wxLog::FlushActive();
@@ -1377,3 +1377,24 @@
#else
# error TC_RESOURCE_DIR undefined
#endif
+--- truecrypt-6.3-source.orig/Core/Unix/CoreService.cpp
++++ truecrypt-6.3-source/Core/Unix/CoreService.cpp
+@@ -341,7 +341,7 @@ namespace TrueCrypt
+
+ string appPath = request.ApplicationExecutablePath;
+ if (appPath.empty())
+- appPath = "truecrypt";
++ appPath = "realcrypt";
+
+ const char *args[] = { "sudo", "-S", "-p", "", appPath.c_str(), TC_CORE_SERVICE_CMDLINE_OPTION, nullptr };
+ execvp (args[0], ((char* const*) args));
--- truecrypt-6.3-source.orig/Core/Unix/CoreUnix.h
++++ truecrypt-6.3-source/Core/Unix/CoreUnix.h
+@@ -50,7 +50,7 @@ namespace TrueCrypt
+ virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); }
+ virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const;
+ virtual string GetDefaultMountPointPrefix () const;
+- virtual string GetFuseMountDirPrefix () const { return ".truecrypt_aux_mnt"; }
++ virtual string GetFuseMountDirPrefix () const { return ".realcrypt_aux_mnt"; }
+ virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0;
+ virtual uid_t GetRealUserId () const;
+ virtual gid_t GetRealGroupId () const;
Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- realcrypt.spec 1 Nov 2009 17:45:34 -0000 1.3
+++ realcrypt.spec 20 Nov 2009 01:52:50 -0000 1.4
@@ -3,7 +3,7 @@
Name: realcrypt
Summary: Cross platform disk encryption software
Version: 6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: TrueCrypt License Version 2.8
Group: Applications/File
URL: http://www.truecrypt.org/
@@ -144,6 +144,9 @@
%changelog
+* Fri Nov 20 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-2
+- fix rebranding patch
+
* Sat Oct 31 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-1
- update to 6.3 and fix rebranding patches
15 years
rpms/realcrypt/F-11 realcrypt-6.3-rebranding.patch, 1.1, 1.2 realcrypt.spec, 1.2, 1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/realcrypt/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15241
Modified Files:
realcrypt-6.3-rebranding.patch realcrypt.spec
Log Message:
* Fri Nov 20 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-2
- fix rebranding patch
realcrypt-6.3-rebranding.patch:
Index: realcrypt-6.3-rebranding.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-11/realcrypt-6.3-rebranding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-6.3-rebranding.patch 1 Nov 2009 17:56:44 -0000 1.1
+++ realcrypt-6.3-rebranding.patch 20 Nov 2009 01:50:50 -0000 1.2
@@ -1,5 +1,5 @@
---- truecrypt-6.3-source/Common/Language.xml
-+++ truecrypt-6.3-source/Common/Language.xml.new
+--- truecrypt-6.3-source.orig/Common/Language.xml
++++ truecrypt-6.3-source/Common/Language.xml
@@ -12,20 +12,20 @@
<control lang="en" key="IDCANCEL">Cancel</control>
<control lang="en" key="IDC_ALL_USERS">Install &for all users</control>
@@ -1071,8 +1071,8 @@
<string lang="en" key="TEST">Test</string>
<string lang="en" key="KEYFILE">Keyfile</string>
<string lang="en" key="VOLUME_LABEL">Name</string>
---- truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp
-+++ truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp.new
+--- truecrypt-6.3-source.orig/Core/Unix/Linux/CoreLinux.cpp
++++ truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp
@@ -113,7 +113,7 @@
{
string devPath = mountedVolume->VirtualDevice;
@@ -1091,8 +1091,8 @@
if (nativeDevCount != cipherCount - 1)
nativeDevName << "_" << cipherCount - nativeDevCount - 2;
---- truecrypt-6.3-source/Core/Unix/CoreUnix.cpp
-+++ truecrypt-6.3-source/Core/Unix/CoreUnix.cpp.new
+--- truecrypt-6.3-source.orig/Core/Unix/CoreUnix.cpp
++++ truecrypt-6.3-source/Core/Unix/CoreUnix.cpp
@@ -205,17 +205,17 @@
string CoreUnix::GetDefaultMountPointPrefix () const
@@ -1115,8 +1115,8 @@
}
uint64 CoreUnix::GetDeviceSize (const DevicePath &devicePath) const
---- truecrypt-6.3-source/Main/UserInterface.cpp
-+++ truecrypt-6.3-source/Main/UserInterface.cpp.new
+--- truecrypt-6.3-source.orig/Main/UserInterface.cpp
++++ truecrypt-6.3-source/Main/UserInterface.cpp
@@ -50,7 +50,7 @@
vector <int> osVersion = SystemInfo::GetVersion();
@@ -1222,8 +1222,8 @@
wxTextCtrl *textCtrl = new wxTextCtrl (&dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
textCtrl->SetFont (wxFont (wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Courier"));
---- truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp
-+++ truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/VolumePropertiesDialog.cpp
++++ truecrypt-6.3-source/Main/Forms/VolumePropertiesDialog.cpp
@@ -69,7 +69,7 @@
AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"]);
@@ -1233,8 +1233,8 @@
{
#endif
AppendToList ("TOTAL_DATA_READ", Gui->SizeToString (volumeInfo.TotalDataRead));
---- truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp
-+++ truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/VolumeCreationWizard.cpp
++++ truecrypt-6.3-source/Main/Forms/VolumeCreationWizard.cpp
@@ -151,7 +151,7 @@
else if (SelectedVolumeType == VolumeType::Hidden)
{
@@ -1244,8 +1244,8 @@
freeSpaceText = StringFormatter (_("Maximum possible hidden volume size for this volume is {0}."), Gui->SizeToString (MaxHiddenVolumeSize));
}
else
---- truecrypt-6.3-source/Main/Application.h
-+++ truecrypt-6.3-source/Main/Application.h.new
+--- truecrypt-6.3-source.orig/Main/Application.h
++++ truecrypt-6.3-source/Main/Application.h
@@ -24,7 +24,7 @@
static DirectoryPath GetExecutableDirectory ();
static FilePath GetExecutablePath ();
@@ -1255,8 +1255,8 @@
static UserInterface *GetUserInterface () { return mUserInterface; }
static UserInterfaceType::Enum GetUserInterfaceType () { return mUserInterfaceType; }
static void Initialize (UserInterfaceType::Enum type);
---- truecrypt-6.3-source/Common/Tcdefs.h
-+++ truecrypt-6.3-source/Common/Tcdefs.h.new
+--- truecrypt-6.3-source.orig/Common/Tcdefs.h
++++ truecrypt-6.3-source/Common/Tcdefs.h
@@ -12,7 +12,7 @@
#ifndef TCDEFS_H
#define TCDEFS_H
@@ -1277,8 +1277,8 @@
enum
{
---- truecrypt-6.3-source/Main/Forms/AboutDialog.cpp
-+++ truecrypt-6.3-source/Main/Forms/AboutDialog.cpp.new
+--- truecrypt-6.3-source.orig/Main/Forms/AboutDialog.cpp
++++ truecrypt-6.3-source/Main/Forms/AboutDialog.cpp
@@ -20,8 +20,8 @@
LogoBitmap->SetBitmap (Resources::GetTextualLogoBitmap());
@@ -1298,8 +1298,8 @@
+ L"A RPMfusion Release");
}
}
---- truecrypt-6.2a-source/Main/GraphicUserInterface.cpp 2008-07-04 11:52:18.000000000 -0700
-+++ truecrypt-6.2a-source/Main/GraphicUserInterface.cpp.new 2008-08-05 20:05:06.000000000 -0700
+--- truecrypt-6.2a-source.orig/Main/GraphicUserInterface.cpp
++++ truecrypt-6.2a-source/Main/GraphicUserInterface.cpp
@@ -823,7 +823,7 @@
#endif
wxLog::FlushActive();
@@ -1377,3 +1377,24 @@
#else
# error TC_RESOURCE_DIR undefined
#endif
+--- truecrypt-6.3-source.orig/Core/Unix/CoreService.cpp
++++ truecrypt-6.3-source/Core/Unix/CoreService.cpp
+@@ -341,7 +341,7 @@ namespace TrueCrypt
+
+ string appPath = request.ApplicationExecutablePath;
+ if (appPath.empty())
+- appPath = "truecrypt";
++ appPath = "realcrypt";
+
+ const char *args[] = { "sudo", "-S", "-p", "", appPath.c_str(), TC_CORE_SERVICE_CMDLINE_OPTION, nullptr };
+ execvp (args[0], ((char* const*) args));
--- truecrypt-6.3-source.orig/Core/Unix/CoreUnix.h
++++ truecrypt-6.3-source/Core/Unix/CoreUnix.h
+@@ -50,7 +50,7 @@ namespace TrueCrypt
+ virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); }
+ virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const;
+ virtual string GetDefaultMountPointPrefix () const;
+- virtual string GetFuseMountDirPrefix () const { return ".truecrypt_aux_mnt"; }
++ virtual string GetFuseMountDirPrefix () const { return ".realcrypt_aux_mnt"; }
+ virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0;
+ virtual uid_t GetRealUserId () const;
+ virtual gid_t GetRealGroupId () const;
Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-11/realcrypt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- realcrypt.spec 1 Nov 2009 17:50:39 -0000 1.2
+++ realcrypt.spec 20 Nov 2009 01:50:50 -0000 1.3
@@ -3,7 +3,7 @@
Name: realcrypt
Summary: Cross platform disk encryption software
Version: 6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: TrueCrypt License Version 2.8
Group: Applications/File
URL: http://www.truecrypt.org/
@@ -144,6 +144,9 @@
%changelog
+* Fri Nov 20 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-2
+- fix rebranding patch
+
* Sat Oct 31 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.3-1
- update to 6.3 and fix rebranding patches
15 years
rpms/sdlmame/F-10 sdlmame.spec,1.70,1.71
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8948
Modified Files:
sdlmame.spec
Log Message:
* Wed Nov 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-2
- Added split and unidasm to the -tools subpackage
- Disabled ldplayer until mame bug 03415 gets fixed
- Worked around gcc ppc preprocessor bug
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sdlmame.spec 1 Nov 2009 17:00:13 -0000 1.70
+++ sdlmame.spec 18 Nov 2009 18:22:56 -0000 1.71
@@ -13,15 +13,15 @@
%global arch_flags PTR64=1
%endif
%ifarch ppc
-%global arch_flags BIGENDIAN=1
+%global arch_flags BIGENDIAN=1 ARCHOPTS=-Upowerpc
%endif
%ifarch ppc64
-%global arch_flags BIGENDIAN=1 PTR64=1
+%global arch_flags BIGENDIAN=1 PTR64=1 ARCHOPTS=-Upowerpc
%endif
Name: sdlmame
Version: 0135
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -34,7 +34,6 @@
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
Patch3: %{name}-fortify.patch
-Patch4: %{name}-0134-nounidasm.patch
BuildRoot: %{_tmppath}/%{name}-%{_version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel
@@ -69,12 +68,12 @@
%description tools
%{summary}.
-%package ldplayer
-Summary: Standalone laserdisc player based on sdlmame
-Group: Applications/Emulators
+#%package ldplayer
+#Summary: Standalone laserdisc player based on sdlmame
+#Group: Applications/Emulators
-%description ldplayer
-%{summary}.
+#%description ldplayer
+#%{summary}.
%prep
@@ -82,7 +81,6 @@
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
%patch3 -p0 -b .fortify
-%patch4 -p1 -b .nounidasm
# Create mame.ini file
cat > mame.ini << EOF
@@ -115,8 +113,8 @@
%build
-make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+#make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
+# OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
%if %{with debug}
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
@@ -160,9 +158,10 @@
%else
install -pm 755 mame %{buildroot}%{_bindir}/mame
%endif
-install -pm 755 chdman jedutil ldplayer ldresample ldverify romcmp testkeys \
- %{buildroot}%{_bindir}
-for tool in regrep runtest src2html srcclean
+#install -pm 755 chdman jedutil ldplayer ldresample ldverify romcmp testkeys \
+install -pm 755 chdman jedutil ldresample ldverify romcmp testkeys \
+ unidasm %{buildroot}%{_bindir}
+for tool in regrep runtest split src2html srcclean
do
install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
done
@@ -195,17 +194,24 @@
%{_bindir}/mame-regrep
%{_bindir}/romcmp
%{_bindir}/mame-runtest
+%{_bindir}/mame-split
%{_bindir}/mame-src2html
%{_bindir}/mame-srcclean
%{_bindir}/testkeys
+%{_bindir}/unidasm
-%files ldplayer
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/ldplayer
+#%files ldplayer
+#%defattr(-,root,root,-)
+#%doc docs/license.txt
+#%{_bindir}/ldplayer
%changelog
+* Wed Nov 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-2
+- Added split and unidasm to the -tools subpackage
+- Disabled ldplayer until mame bug 03415 gets fixed
+- Worked around gcc ppc preprocessor bug
+
* Sun Nov 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-1
- Updated to 0.135
15 years
rpms/sdlmame/F-11 sdlmame.spec,1.69,1.70
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6196
Modified Files:
sdlmame.spec
Log Message:
Don't try to install disabled ldplayer
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sdlmame.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sdlmame.spec 18 Nov 2009 17:12:50 -0000 1.69
+++ sdlmame.spec 18 Nov 2009 17:43:16 -0000 1.70
@@ -158,7 +158,8 @@
%else
install -pm 755 mame %{buildroot}%{_bindir}/mame
%endif
-install -pm 755 chdman jedutil ldplayer ldresample ldverify romcmp testkeys \
+#install -pm 755 chdman jedutil ldplayer ldresample ldverify romcmp testkeys \
+install -pm 755 chdman jedutil ldresample ldverify romcmp testkeys \
unidasm %{buildroot}%{_bindir}
for tool in regrep runtest split src2html srcclean
do
15 years
rpms/sdlmame/F-11 sdlmame.spec,1.68,1.69
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4129
Modified Files:
sdlmame.spec
Log Message:
* Wed Nov 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-2
- Added split and unidasm to the -tools subpackage
- Disabled ldplayer until mame bug 03415 gets fixed
- Worked around gcc ppc preprocessor bug
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sdlmame.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sdlmame.spec 1 Nov 2009 17:00:01 -0000 1.68
+++ sdlmame.spec 18 Nov 2009 17:12:50 -0000 1.69
@@ -13,15 +13,15 @@
%global arch_flags PTR64=1
%endif
%ifarch ppc
-%global arch_flags BIGENDIAN=1
+%global arch_flags BIGENDIAN=1 ARCHOPTS=-Upowerpc
%endif
%ifarch ppc64
-%global arch_flags BIGENDIAN=1 PTR64=1
+%global arch_flags BIGENDIAN=1 PTR64=1 ARCHOPTS=-Upowerpc
%endif
Name: sdlmame
Version: 0135
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -34,7 +34,6 @@
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
Patch3: %{name}-fortify.patch
-Patch4: %{name}-0134-nounidasm.patch
BuildRoot: %{_tmppath}/%{name}-%{_version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel
@@ -69,12 +68,12 @@
%description tools
%{summary}.
-%package ldplayer
-Summary: Standalone laserdisc player based on sdlmame
-Group: Applications/Emulators
+#%package ldplayer
+#Summary: Standalone laserdisc player based on sdlmame
+#Group: Applications/Emulators
-%description ldplayer
-%{summary}.
+#%description ldplayer
+#%{summary}.
%prep
@@ -82,7 +81,6 @@
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
%patch3 -p0 -b .fortify
-%patch4 -p1 -b .nounidasm
# Create mame.ini file
cat > mame.ini << EOF
@@ -115,8 +113,8 @@
%build
-make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+#make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
+# OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
%if %{with debug}
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
@@ -161,8 +159,8 @@
install -pm 755 mame %{buildroot}%{_bindir}/mame
%endif
install -pm 755 chdman jedutil ldplayer ldresample ldverify romcmp testkeys \
- %{buildroot}%{_bindir}
-for tool in regrep runtest src2html srcclean
+ unidasm %{buildroot}%{_bindir}
+for tool in regrep runtest split src2html srcclean
do
install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
done
@@ -195,17 +193,24 @@
%{_bindir}/mame-regrep
%{_bindir}/romcmp
%{_bindir}/mame-runtest
+%{_bindir}/mame-split
%{_bindir}/mame-src2html
%{_bindir}/mame-srcclean
%{_bindir}/testkeys
+%{_bindir}/unidasm
-%files ldplayer
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/ldplayer
+#%files ldplayer
+#%defattr(-,root,root,-)
+#%doc docs/license.txt
+#%{_bindir}/ldplayer
%changelog
+* Wed Nov 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-2
+- Added split and unidasm to the -tools subpackage
+- Disabled ldplayer until mame bug 03415 gets fixed
+- Worked around gcc ppc preprocessor bug
+
* Sun Nov 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-1
- Updated to 0.135
15 years
rpms/qmc2/devel qmc2-cflags.patch,NONE,1.1 qmc2.spec,1.20,1.21
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29351
Modified Files:
qmc2.spec
Added Files:
qmc2-cflags.patch
Log Message:
- Worked around RH bug 532763 for Fedora 12 and above
- Added Fedora 12 config
qmc2-cflags.patch:
--- NEW FILE qmc2-cflags.patch ---
Index: Makefile
===================================================================
--- Makefile (wersja 1785)
+++ Makefile (wersja 1786)
@@ -210,6 +210,16 @@
FADER_SPEED = 500
endif
+# CC_FLAGS: additional flags passed to the C compiler
+ifndef CC_FLAGS
+CC_FLAGS =
+endif
+
+# CXX_FLAGS: additional flags passed to the C++ compiler
+ifndef CXX_FLAGS
+CXX_FLAGS =
+endif
+
# >>> END OF MAKE OPTIONS <<<
# emulator target fallback for mameuifx32
@@ -357,6 +367,22 @@
DISTCC=0
endif
+# C++ flags
+ifdef QMAKE_CXX_FLAGS
+undef QMAKE_CXX_FLAGS
+endif
+ifneq '$(CXX_FLAGS)' ''
+QMAKE_CXX_FLAGS += QMAKE_CXXFLAGS=$(CXX_FLAGS)
+endif
+
+# C flags
+ifdef QMAKE_CC_FLAGS
+undef QMAKE_CC_FLAGS
+endif
+ifneq '$(CC_FLAGS)' ''
+QMAKE_CC_FLAGS += QMAKE_CFLAGS_RELEASE=$(CC_FLAGS)
+endif
+
# targets/rules
all: $(PROJECT)-bin
@@ -400,7 +426,7 @@
$(QMAKEFILE): $(PROJECT).pro
@echo "Configuring build of QMC2 v$(VERSION)"
@$(shell scripts/setup_imgset.sh "$(IMGSET)" "$(RM)" "$(LN)" "$(BASENAME)" > /dev/null)
- @$(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) '$(DEFINES)' -o Makefile.qmake $< > /dev/null
+ @$(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) $(QMAKE_CXX_FLAGS) $(QMAKE_CC_FLAGS) '$(DEFINES)' -o Makefile.qmake $< > /dev/null
else
$(PROJECT)-bin: lang $(QMAKEFILE)
ifeq '$(ARCH)' 'Darwin'
@@ -429,7 +455,7 @@
$(QMAKEFILE): $(PROJECT).pro
@echo "Configuring build of QMC2 v$(VERSION)"
@$(shell scripts/setup_imgset.sh "$(IMGSET)" "$(RM)" "$(LN)" "$(BASENAME)")
- $(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) '$(DEFINES)' -o Makefile.qmake $<
+ $(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) $(QMAKE_CXX_FLAGS) $(QMAKE_CC_FLAGS) '$(DEFINES)' -o Makefile.qmake $<
endif
install: bin
@@ -588,6 +614,8 @@
@echo "BASENAME=<basename> UNIX command basename $(BASENAME)"
@echo "BINDIR=<bindir> Binary directory for installation $(BINDIR)"
@echo "BROWSER_EXTRAS=<ena> Enable browser extra features (0, 1) $(BROWSER_EXTRAS)"
+ @echo "CC_FLAGS=<c_flags> Additional flags passed to the C compiler $(CC_FLAGS)"
+ @echo "CXX_FLAGS=<cxx_flags> Additional flags passed to the C++ compiler $(CXX_FLAGS)"
@echo "CCACHE=<ccache> Use a compiler cache (0, 1) $(CCACHE)"
@echo "CCACHE_CC=<cc> Command used for cached cc $(CCACHE_CC)"
@echo "CCACHE_CXX=<cxx> Command used for cached c++ $(CCACHE_CXX)"
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qmc2.spec 1 Nov 2009 16:23:35 -0000 1.20
+++ qmc2.spec 16 Nov 2009 15:33:35 -0000 1.21
@@ -10,6 +10,7 @@
URL: http://qmc2.arcadehits.net/
Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2
Patch1: qmc2-ini.patch
+Patch2: qmc2-cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -59,14 +60,21 @@
pushd sdlmess
%patch1 -p0 -b .ini~
+%patch2 -p0 -b .cflags
+mv arch/Linux/Fedora_release_11.92.cfg arch/Linux/Fedora_release_12.cfg
popd
pushd sdlmame
%patch1 -p0 -b .ini~
+%patch2 -p0 -b .cflags
+mv arch/Linux/Fedora_release_11.92.cfg arch/Linux/Fedora_release_12.cfg
popd
%build
+%if 0%{?fedora} >= 12
+export CXX_FLAGS=-fno-var-tracking-assignments
+%endif
pushd sdlmess
QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
@@ -140,8 +148,10 @@
%changelog
-* Sun Nov 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.16.b12
+* Mon Nov 16 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.16.b12
- Updated to 0.2b12
+- Worked around RH bug 532763 for Fedora 12 and above
+- Added Fedora 12 config
* Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.15.b11
- Updated to 0.2b11
15 years
rpms/mplayer/F-11 mplayer-config.patch, 1.2, 1.3 mplayer-manlinks.patch, 1.2, 1.3 mplayer-nodvdcss.patch, 1.5, 1.6 mplayer-qcelp.patch, 1.1, 1.2 mplayer-cflags.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18529
Modified Files:
mplayer-config.patch mplayer-manlinks.patch
mplayer-nodvdcss.patch mplayer-qcelp.patch
Removed Files:
mplayer-cflags.patch
Log Message:
Forgot to update patches.
mplayer-config.patch:
Index: mplayer-config.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-config.patch 19 Aug 2008 12:32:35 -0000 1.2
+++ mplayer-config.patch 15 Nov 2009 21:17:13 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up mplayer-export-2008-08-18/etc/example.conf.orig mplayer-export-2008-08-18/etc/example.conf
---- mplayer-export-2008-08-18/etc/example.conf.orig 2008-02-08 19:33:39.000000000 +0100
-+++ mplayer-export-2008-08-18/etc/example.conf 2008-08-19 13:47:15.000000000 +0200
+diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-10-29/etc/example.conf
+--- mplayer-export-2009-10-29/etc/example.conf.config 2008-02-08 19:33:39.000000000 +0100
++++ mplayer-export-2009-10-29/etc/example.conf 2009-10-29 23:54:30.000000000 +0100
@@ -1,7 +1,7 @@
#
# MPlayer configuration file
@@ -44,13 +44,16 @@
# cache settings
#
# Use 8MB input cache by default.
-@@ -122,6 +131,9 @@
+@@ -122,6 +131,12 @@
# DVD: Play English audio tracks if available.
#alang = en
+# A plugged in joystick can interfere with keyboard shortcuts
+joystick = no
+
++# Inhibit (a XScrnSaver compatible) screensaver while playing a movie
++stop-xscreensaver = yes
++
###################
# DVDNAV Settings #
###################
mplayer-manlinks.patch:
Index: mplayer-manlinks.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-manlinks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-manlinks.patch 19 Aug 2008 12:32:35 -0000 1.2
+++ mplayer-manlinks.patch 15 Nov 2009 21:17:13 -0000 1.3
@@ -1,16 +1,26 @@
-diff -up mplayer-export-2008-08-18/Makefile.manlinks mplayer-export-2008-08-18/Makefile
---- mplayer-export-2008-08-18/Makefile.manlinks 2008-08-14 22:42:54.000000000 +0200
-+++ mplayer-export-2008-08-18/Makefile 2008-08-19 13:50:17.000000000 +0200
-@@ -830,7 +830,7 @@ install-mencoder-man: $(foreach lang,$(M
+diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile
+--- mplayer-export-2009-10-29/Makefile.manlinks 2009-10-19 11:56:18.000000000 +0200
++++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:42:36.000000000 +0100
+@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M
install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
+ install-gui-man-en: install-mplayer-man-en
+- cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
++ echo ".so mplayer.1" > $(MANDIR)/man1/gmplayer.1
+
install-mencoder-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
+ echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1
install-mplayer-man-en:
$(INSTALL) -d $(MANDIR)/man1
-@@ -838,7 +838,7 @@ install-mplayer-man-en:
+@@ -933,12 +933,12 @@ install-mplayer-man-en:
+
+ define GUI_MAN_RULE
+ install-gui-man-$(lang): install-mplayer-man-$(lang)
+- cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
++ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
+ endef
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
mplayer-nodvdcss.patch:
Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-nodvdcss.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer-nodvdcss.patch 31 Mar 2009 17:37:39 -0000 1.5
+++ mplayer-nodvdcss.patch 15 Nov 2009 21:17:13 -0000 1.6
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2009-03-29/configure.nodvdcss mplayer-export-2009-03-29/configure
---- mplayer-export-2009-03-29/configure.nodvdcss 2009-03-29 00:21:21.000000000 +0100
-+++ mplayer-export-2009-03-29/configure 2009-03-29 11:20:11.000000000 +0200
-@@ -622,7 +622,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2009-10-29/configure.nodvdcss mplayer-export-2009-10-29/configure
+--- mplayer-export-2009-10-29/configure.nodvdcss 2009-10-28 14:55:18.000000000 +0100
++++ mplayer-export-2009-10-29/configure 2009-10-30 00:36:25.000000000 +0100
+@@ -639,7 +639,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
@@ -10,10 +10,10 @@
_xanim=auto
_real=auto
_live=auto
-diff -up mplayer-export-2009-03-29/Makefile.nodvdcss mplayer-export-2009-03-29/Makefile
---- mplayer-export-2009-03-29/Makefile.nodvdcss 2009-03-29 11:20:11.000000000 +0200
-+++ mplayer-export-2009-03-29/Makefile 2009-03-29 11:20:55.000000000 +0200
-@@ -345,11 +345,6 @@ SRCS_COMMON-$(LIBDCA) +=
+diff -up mplayer-export-2009-10-29/Makefile.nodvdcss mplayer-export-2009-10-29/Makefile
+--- mplayer-export-2009-10-29/Makefile.nodvdcss 2009-10-19 11:56:18.000000000 +0200
++++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:37:10.000000000 +0100
+@@ -150,11 +150,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
@@ -24,20 +24,20 @@
- libdvdcss/libdvdcss.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
- SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
-@@ -745,7 +740,6 @@ DIRS = . \
- libavcodec/x86 \
- libavformat \
- libavutil \
+
+@@ -752,7 +747,6 @@ DIRS = . \
+ libavutil/ppc \
+ libavutil/sh4 \
+ libavutil/x86 \
- libdvdcss \
libdvdnav \
libdvdnav/vm \
libdvdread4 \
-@@ -852,7 +846,6 @@ version.h: version.sh
- # Make sure all generated header files are created.
- $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h
+@@ -871,7 +865,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
+ $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
+ $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h
--libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS)
- libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
- libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV)
- libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
+-libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
+ libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
+ libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
+ libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)
mplayer-qcelp.patch:
Index: mplayer-qcelp.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-qcelp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-qcelp.patch 9 Aug 2008 09:32:32 -0000 1.1
+++ mplayer-qcelp.patch 15 Nov 2009 21:17:13 -0000 1.2
@@ -1,8 +1,8 @@
-diff -up mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c
---- mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp 2008-01-13 17:00:39.000000000 +0100
-+++ mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c 2008-02-22 21:19:57.000000000 +0100
-@@ -40,6 +40,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT
- {"MPA", 0x55},
+diff -up mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c.qcelp mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c
+--- mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c.qcelp 2009-05-13 04:58:57.000000000 +0200
++++ mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c 2009-10-30 00:36:02.000000000 +0100
+@@ -42,6 +42,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT
+ {"MPA", 0x55},
{"vorbis", mmioFOURCC('v','r','b','s')},
{"mpeg4-generic", mmioFOURCC('M','P','4','A')},
+ {"x-Purevoice", mmioFOURCC('Q','c','l','p')},
--- mplayer-cflags.patch DELETED ---
15 years
rpms/e-uae/F-10 e-uae.spec,1.3,1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/e-uae/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12238
Modified Files:
e-uae.spec
Log Message:
* Sun Nov 15 2009 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.14.wip4
- Work around fix for libcaps support
Index: e-uae.spec
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/F-10/e-uae.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- e-uae.spec 18 Oct 2009 14:48:40 -0000 1.3
+++ e-uae.spec 15 Nov 2009 19:42:51 -0000 1.4
@@ -1,6 +1,6 @@
Name: e-uae
Version: 0.8.29
-Release: 0.13.wip4%{?dist}
+Release: 0.14.wip4%{?dist}
Summary: A powerful Amiga Emulator, based on UAE
Group: Applications/Emulators
License: GPLv2+
@@ -65,6 +65,8 @@
# --enable-autoconfig : Defaults to yes if threads enabled (they should be)
# --enable-fdi : Defaults to on
%ifarch %{ix86} x86_64 ppc
+# Fix for libcaps support
+export LDFLAGS=-lstdc++
%configure --enable-bsdsock-new \
--enable-ui \
--enable-audio \
@@ -152,6 +154,9 @@
%changelog
+* Sun Nov 15 2009 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.14.wip4
+- Work around fix for libcaps support
+
* Sun Oct 18 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.8.29-0.13.wip4
- fixed a 64bit gtk+ bug causing a segfault (BZ #850)
15 years
