diff options
author | Vijay Marcel <vijaymarcel@outlook.com> | 2022-09-24 22:12:38 +0100 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-09-25 13:59:47 +0700 |
commit | c6b8cacaa8bb8a3b5ba3f5639bb0b1fdb15de687 (patch) | |
tree | c23b76f6b22464be6023e4b45e89727f98af2d3f /multimedia | |
parent | 6e38e408ea8a4d54363a45b89f098c479b00bdaf (diff) |
multimedia/winff: Rebuilt with qt5.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/winff/README | 8 | ||||
-rw-r--r-- | multimedia/winff/changelog | 72 | ||||
-rw-r--r-- | multimedia/winff/patches/unit1_lfm.patch | 246 | ||||
-rw-r--r-- | multimedia/winff/patches/unit1_pas.patch | 63 | ||||
-rw-r--r-- | multimedia/winff/patches/unit2_pas.patch | 11 | ||||
-rw-r--r-- | multimedia/winff/patches/unit3_lfm.patch | 124 | ||||
-rw-r--r-- | multimedia/winff/patches/unit3_pas.patch | 81 | ||||
-rw-r--r-- | multimedia/winff/patches/unit4_pas.patch | 11 | ||||
-rw-r--r-- | multimedia/winff/patches/unit5_pas.patch | 11 | ||||
-rw-r--r-- | multimedia/winff/patches/unit6_pas.patch | 11 | ||||
-rw-r--r-- | multimedia/winff/patches/winff_1.patch | 15 | ||||
-rw-r--r-- | multimedia/winff/patches/winff_en_GB_po.patch | 69 | ||||
-rw-r--r-- | multimedia/winff/patches/winff_lpi.patch | 32 | ||||
-rw-r--r-- | multimedia/winff/patches/winff_lpr.patch | 11 | ||||
-rw-r--r-- | multimedia/winff/patches/winff_po.patch | 58 | ||||
-rw-r--r-- | multimedia/winff/patches/winff_pot.patch | 58 | ||||
-rw-r--r-- | multimedia/winff/winff.SlackBuild | 64 | ||||
-rw-r--r-- | multimedia/winff/winff.info | 2 |
18 files changed, 911 insertions, 36 deletions
diff --git a/multimedia/winff/README b/multimedia/winff/README index 28b41f7f77ce..10961045aa4b 100644 --- a/multimedia/winff/README +++ b/multimedia/winff/README @@ -27,6 +27,8 @@ There was also an issue with opening the documetation in slackware, The paths to the documetation is hardcoded in the source file. I've patched it to look in the /usr/doc/$PRGNAM-$VERSION folder -The default pdf viewer is xpdf. It is hardcoded in the -source file.If Xpdf is not present in the system it will -not open pdf documentation. +I've patched winff to use xdg-open to use the user's default +pdf viewer. + +This build now uses qt5 hence libqtpas is now a dependency. +Install libqtpas before installing lazarus. diff --git a/multimedia/winff/changelog b/multimedia/winff/changelog new file mode 100644 index 000000000000..6da305c6fba7 --- /dev/null +++ b/multimedia/winff/changelog @@ -0,0 +1,72 @@ +Changelog for Winff SlackBuild Script +-------------------------------------------------------------------- + +09/09/2022: + +Took over as maintainer for the Winff SlackBuild +script. + +The Original author of Winff no longer maintains and is +now maintained by Debian Maintainer Paul Gevers. + +Corrected the various dead URL.Updated the various URL to +https.patched it to look in the slackware's doc folder. +see these posts for details. +https://github.com/WinFF/winff/issues/250 +https://ffmpeg.org/download.html#build-windows + +24/09/2022: + +Winff will now use the users default pdf viewer using +xdg-open also added support for Okular pdf reader. It will +now use the -O2 optimization and added some hardening flags +to the linker and fix wrongly escaped single quote in the +man page.I've added these patches from Debian Maintainer +Paul Gevers. + +Removed the hint that said TEST in the lower left side corner +of the GUI,when you hover the mouse in the area between the +convert button and options button.Fixed the Dialog boxes under +the Ffmpeg tab were it will now show pass 1 and pass 2 separately +previously the pass 1 dialog was merged with the top parameter +dialog box.Put Underscore between the "Cancel Changes", +"Apply Changes" and "Apply to All" buttons and will now be +further apart for clarity. From FFmpeg versions 5 and later +the -vol command will fail.For example -vol 512 has been changed +to -filter:a "volume=1.5", since slackware uses FFmpeg4 +this is not a problem for now.Added Hints to the 2 buttons +next to the folder path.The open was not working due to +older lazarus not passing commands updating to Lazarus 2.2.2-0 +will solve that problem.If you cross compile winff for windows +without patching the language files it will show the old links. +Thanks to David Miller for patches,Improvments and testing Winff. + +Created a set of patches instead of sed commands. + +Extended the Copyright, which previously was upto the year 2016. + +GTK2 has reached end of life also GTK3 widget set support in +lazarus is in alpha stage in lazarus.See the following post +for details. + +https://blog.gtk.org/2020/12/16/gtk-4-0/ +https://wiki.freepascal.org/Widgetset + +As such it no longer make sense to default to GTK.We will +now default to qt5 nstead of GTK.Therefore libqtpas is now a +dependency. Install libqtpas before installing lazarus. + +Removed a Dangling link to AV GNU/Linux Distro. + +If for Some reason "Cancel changes","Apply to all" and +"Apply changes" button does not appear do not fret, Enter the +Values you need to modify in Video/Audio/Crop/Time and then +add the file to convert it would pass the options.You can check +the Command in the FFmpeg tab. This is a workaround. + +Patched the manpage to show the winff docmentation location +in slackware. + +This build removes all other localization files except english +since it contains outdated links and may pose security risk. +Bumped the build no. diff --git a/multimedia/winff/patches/unit1_lfm.patch b/multimedia/winff/patches/unit1_lfm.patch new file mode 100644 index 000000000000..d5373a41fdec --- /dev/null +++ b/multimedia/winff/patches/unit1_lfm.patch @@ -0,0 +1,246 @@ +--- winff-1/winff/unit1.lfm 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/unit1.lfm 2022-09-24 16:48:10.735961896 +0530 +@@ -364,7 +364,7 @@ + object pnlTop: TPanel + Left = 0 + Height = 55 +- Hint = 'TEST' ++ Hint = '' + Top = 0 + Width = 640 + Align = alTop +@@ -915,11 +915,11 @@ + TabOrder = 5 + end + object btnOptions: TBitBtn +- Left = 571 ++ Left = 540 + Height = 53 + Hint = 'Open/close the additional options window' + Top = 1 +- Width = 68 ++ Width = 60 + Align = alRight + AutoSize = True + Caption = 'Options' +@@ -1099,7 +1099,7 @@ + Height = 23 + Hint = 'Device or file type the video should be converted to' + Top = 20 +- Width = 619 ++ Width = 590 + Align = alTop + BorderSpacing.Left = 13 + ItemHeight = 15 +@@ -1114,7 +1114,7 @@ + Height = 23 + Hint = 'Specific settings to use for the chosen device or file type' + Top = 61 +- Width = 619 ++ Width = 590 + Align = alTop + BorderSpacing.Left = 13 + ItemHeight = 15 +@@ -1152,7 +1152,7 @@ + Height = 33 + Hint = 'Target location for the final video (choose a different folder than the source folder)' + Top = 18 +- Width = 508 ++ Width = 450 + Align = alClient + BorderSpacing.Left = 13 + BorderSpacing.Right = 5 +@@ -1161,8 +1161,9 @@ + end + object ChooseFolderBtn: TButton + AnchorSideLeft.Side = asrBottom +- Left = 526 ++ Left = 500 + Height = 33 ++ Hint = 'Choose the destination folder for the converted media' + Top = 18 + Width = 43 + Align = alRight +@@ -1176,6 +1177,7 @@ + AnchorSideLeft.Side = asrBottom + Left = 569 + Height = 33 ++ Hint = 'Open the folder containing the finished converted media' + Top = 18 + Width = 63 + Align = alRight +@@ -2096,7 +2098,7 @@ + Height = 23 + Hint = '<hh:mm:ss> - Seek to this position before start converting' + Top = 35 +- Width = 39 ++ Width = 62 + BorderSpacing.Top = 10 + OnChange = AllowChanges + TabOrder = 0 +@@ -2110,7 +2112,7 @@ + Height = 23 + Hint = '<hh:mm:ss> - Seek to this position before start converting' + Top = 35 +- Width = 41 ++ Width = 62 + BorderSpacing.Left = 10 + BorderSpacing.Top = 10 + MaxValue = 59 +@@ -2126,7 +2128,7 @@ + Height = 23 + Hint = '<hh:mm:ss> - Seek to this position before start converting' + Top = 35 +- Width = 42 ++ Width = 62 + BorderSpacing.Left = 10 + BorderSpacing.Top = 10 + MaxValue = 59 +@@ -2141,7 +2143,7 @@ + Height = 23 + Hint = '<hh:mm:ss> - Stop after this much of video converted' + Top = 68 +- Width = 39 ++ Width = 62 + BorderSpacing.Top = 10 + OnChange = AllowChanges + TabOrder = 3 +@@ -2155,7 +2157,7 @@ + Height = 23 + Hint = '<hh:mm:ss> - Stop after this much of video converted' + Top = 68 +- Width = 41 ++ Width = 62 + BorderSpacing.Left = 10 + BorderSpacing.Top = 10 + MaxValue = 59 +@@ -2171,7 +2173,7 @@ + Height = 23 + Hint = '<hh:mm:ss> - Stop after this much of video converted' + Top = 68 +- Width = 42 ++ Width = 62 + BorderSpacing.Left = 10 + BorderSpacing.Top = 10 + MaxValue = 59 +@@ -2205,7 +2207,7 @@ + Width = 627 + Align = alClient + AutoSize = True +- BorderSpacing.Left = 5 ++ BorderSpacing.Left = 3 + BevelOuter = bvNone + ClientHeight = 183 + ClientWidth = 627 +@@ -2215,7 +2217,7 @@ + Left = 11 + Height = 15 + Top = 3 +- Width = 202 ++ Width = 190 + BorderSpacing.Top = 3 + Caption = 'Additional Command Line Parameters' + ParentColor = False +@@ -2227,27 +2229,27 @@ + AnchorSideRight.Control = Panel8 + AnchorSideRight.Side = asrBottom + Left = 0 +- Height = 23 +- Top = 21 ++ Height = 15 ++ Top = 33 + Width = 627 + Anchors = [akTop, akLeft, akRight] +- BorderSpacing.Top = 3 ++ BorderSpacing.Top = 5 + OnChange = AllowChanges + TabOrder = 0 + end + object Label5: TLabel + Left = 4 +- Height = 15 +- Top = 55 +- Width = 41 ++ Height = 25 ++ Top = 75 ++ Width = 46 + Caption = '1st Pass' + ParentColor = False + end + object memFirstPass: TMemo + Left = 55 +- Height = 63 +- Top = 50 +- Width = 569 ++ Height = 60 ++ Top = 70 ++ Width = 530 + Anchors = [akTop, akLeft, akRight] + OnChange = AllowChanges + ScrollBars = ssAutoBoth +@@ -2256,8 +2258,8 @@ + object MemSecondPass: TMemo + Left = 55 + Height = 60 +- Top = 114 +- Width = 569 ++ Top = 130 ++ Width = 530 + Anchors = [akTop, akLeft, akRight] + OnChange = AllowChanges + ScrollBars = ssAutoBoth +@@ -2266,7 +2268,7 @@ + object Label6: TLabel + Left = 0 + Height = 15 +- Top = 114 ++ Top = 135 + Width = 46 + Caption = '2nd Pass' + ParentColor = False +@@ -2288,37 +2290,39 @@ + TabOrder = 1 + Visible = False + object lblSaveChanges: TLabel +- Left = 481 ++ Left = 453 + Height = 15 + Hint = 'Click here to apply settings changes to the file conversion above' + Top = -2 + Width = 80 + Anchors = [akTop, akRight] +- Caption = 'Apply Changes' ++ Caption = 'Apply_Changes' + Color = clBtnFace + ParentColor = False + Transparent = False + OnClick = lblSaveChangesClick + end + object lblCancelChanges: TLabel +- Left = 385 ++ Left = 333 + Height = 15 ++ Hint = 'Click here to cancel changes to the file conversion above' + Top = -2 + Width = 85 + Anchors = [akTop, akRight] +- Caption = 'Cancel Changes' ++ Caption = 'Cancel_Changes' + Color = clBtnFace + ParentColor = False + Transparent = False + OnClick = lblCancelChangesClick + end + object lblApplytoAll: TLabel +- Left = 569 ++ Left = 563 + Height = 15 ++ Hint = 'Click here to apply settings changes to all the file conversions above' + Top = -2 + Width = 62 + Anchors = [akTop, akRight] +- Caption = 'Apply to All' ++ Caption = 'Apply_to_All' + Color = clBtnFace + ParentColor = False + Transparent = False diff --git a/multimedia/winff/patches/unit1_pas.patch b/multimedia/winff/patches/unit1_pas.patch new file mode 100644 index 000000000000..cb68d03a3c3e --- /dev/null +++ b/multimedia/winff/patches/unit1_pas.patch @@ -0,0 +1,63 @@ +--- unit1.pas 2022-09-03 11:44:10.000000000 +0530 ++++ unit1.pas 2022-09-18 21:46:23.128973768 +0530 +@@ -2,7 +2,7 @@ + + // WInFF 1.0 Copyright 2006-2012 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify +@@ -1390,10 +1390,12 @@ + begin + {$ifdef linux} + s:=''; ++ if fileexists('/usr/bin/okular') then s:='/usr/bin/okular'; + if fileexists('/usr/bin/evince') then s:='/usr/bin/evince'; + if fileexists('/usr/bin/kpdf') then s:='/usr/bin/kpdf'; + if fileexists('/usr/bin/xpdf') then s:='/usr/bin/xpdf'; + if fileexists('/usr/bin/acroread') then s:='/usr/bin/acroread'; ++ if fileexists('/usr/bin/xdg-open') then s:='/usr/bin/xdg-open'; + if s='' then + begin + Showmessage('More information can be found at ' + pdffile); +@@ -1984,16 +1986,16 @@ + language:=leftstr(lang,2); + {$ifdef linux} + s :=''; +- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf'; ++ if fileexists('/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf.gz'; ++ if fileexists('/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf'; + if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf'; + if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz'; + if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz'; + if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf'; + if s='' then + begin +- s := '/usr/share/doc/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf'; ++ s := '/usr/doc/winff-20220903_8e4491b/WinFF.en.pdf.gz'; ++ if fileexists('/usr/doc/winff-20220903_8e4491b/WinFF.en.pdf') then s:='/usr/doc/winff-20220903_8e4491b/WinFF.en.pdf'; + if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf'; + if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz'; + if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz'; +@@ -2011,7 +2013,7 @@ + procedure TfrmMain.mitForumsClick(Sender: TObject); + + begin +- launchbrowser('http://www.winff.org/forums/'); ++ launchbrowser('http://github.com/WinFF/winff/issues'); + end; + + procedure TfrmMain.mitRestoreDefaultsClick(Sender: TObject); +@@ -2110,7 +2112,7 @@ + procedure TfrmMain.mitWinffClick(Sender: TObject); + + begin +- launchbrowser('http://www.winff.org/'); ++ launchbrowser('https://github.com/WinFF/winff'); + end; + + // menu: about diff --git a/multimedia/winff/patches/unit2_pas.patch b/multimedia/winff/patches/unit2_pas.patch new file mode 100644 index 000000000000..b47c41de755f --- /dev/null +++ b/multimedia/winff/patches/unit2_pas.patch @@ -0,0 +1,11 @@ +--- unit2.pas 2022-09-03 11:44:10.000000000 +0530 ++++ unit2.pas 2022-09-18 20:46:51.427984026 +0530 +@@ -2,7 +2,7 @@ + + // WinFF Copyright 2006-2012 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/unit3_lfm.patch b/multimedia/winff/patches/unit3_lfm.patch new file mode 100644 index 000000000000..a2b13b77ce10 --- /dev/null +++ b/multimedia/winff/patches/unit3_lfm.patch @@ -0,0 +1,124 @@ +--- winff-1/winff/unit3.lfm 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/unit3.lfm 2022-09-24 15:47:28.210972357 +0530 +@@ -1,12 +1,12 @@ + object frmAbout: TfrmAbout
+ Left = 323
+- Height = 300
++ Height = 325
+ Top = 212
+ Width = 384
+ BorderIcons = [biSystemMenu]
+ BorderStyle = bsDialog
+ Caption = 'About WinFF'
+- ClientHeight = 300
++ ClientHeight = 350
+ ClientWidth = 384
+ Color = clForm
+ Constraints.MinHeight = 300
+@@ -144,8 +144,8 @@ + object lblGevers: TLabel
+ Cursor = crHandPoint
+ Left = 4
+- Height = 20
+- Top = 136
++ Height = 25
++ Top = 140
+ Width = 372
+ Align = alTop
+ BorderSpacing.Left = 4
+@@ -188,11 +188,11 @@ + AnchorSideTop.Side = asrBottom
+ Cursor = crHandPoint
+ Left = 57
+- Height = 20
+- Top = 29
++ Height = 25
++ Top = 33
+ Width = 137
+ BorderSpacing.Around = 5
+- Caption = 'http://www.winff.org'
++ Caption = 'https://github.com/WinFF/winff'
+ Font.Color = clBlue
+ ParentColor = False
+ ParentFont = False
+@@ -303,8 +303,8 @@ + object lblStoffberg: TLabel
+ Cursor = crHandPoint
+ Left = 4
+- Height = 20
+- Top = 116
++ Height = 25
++ Top = 120
+ Width = 372
+ Align = alTop
+ BorderSpacing.Left = 4
+@@ -322,7 +322,7 @@ + ClientWidth = 376
+ object lblFFmeg: TLabel
+ Left = 5
+- Height = 20
++ Height = 25
+ Top = 0
+ Width = 371
+ Align = alTop
+@@ -347,25 +347,28 @@ + object lblURLffmpeg: TLabel
+ Cursor = crHandPoint
+ Left = 5
+- Height = 20
+- Top = 44
++ Height = 25
++ Top = 45
+ Width = 371
+ Align = alTop
+ BorderSpacing.Left = 5
+ BorderSpacing.Top = 2
+ BorderSpacing.Bottom = 5
+- Caption = 'http://ffmpeg.org'
++ Caption = 'https://ffmpeg.org'
+ Font.Color = clBlue
+ ParentColor = False
+ ParentFont = False
+ OnClick = lblURLffmpegClick
+ end
+ object lblWindowsBuilds: TLabel
+- Left = 0
+- Height = 20
+- Top = 69
++ Left = 5
++ Height = 25
++ Top = 75
+ Width = 376
+ Align = alTop
++ BorderSpacing.Left = 5
++ BorderSpacing.Top = 2
++ BorderSpacing.Bottom = 5
+ Caption = 'Windows Builds by'
+ ParentColor = False
+ ShowAccelChar = False
+@@ -373,18 +376,16 @@ + end
+ object lblwinbuilds: TLabel
+ Cursor = crHandPoint
+- Left = 0
+- Height = 16
+- Top = 89
++ Left = 5
++ Height = 30
++ Top = 95
+ Width = 376
+ Align = alTop
+- Caption = 'Kyle Schwarz'
+- Font.CharSet = ANSI_CHARSET
++ BorderSpacing.Left = 5
++ BorderSpacing.Top = 2
++ BorderSpacing.Bottom = 7
++ Caption = 'Gyan Doshi'
+ Font.Color = clBlue
+- Font.Height = -13
+- Font.Name = 'Arial'
+- Font.Pitch = fpVariable
+- Font.Quality = fqDraft
+ ParentColor = False
+ ParentFont = False
+ OnClick = lblwinbuildsClick
diff --git a/multimedia/winff/patches/unit3_pas.patch b/multimedia/winff/patches/unit3_pas.patch new file mode 100644 index 000000000000..5a36cc91de3d --- /dev/null +++ b/multimedia/winff/patches/unit3_pas.patch @@ -0,0 +1,81 @@ +--- winff-1/winff/unit3.pas 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/unit3.pas 2022-09-24 16:04:02.473969501 +0530 +@@ -2,7 +2,7 @@ + + // WInFF 1.0 Copyright 2006-2013 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify +@@ -62,7 +62,6 @@ + procedure lblBellardClick(Sender: TObject); + procedure lblGeversClick(Sender: TObject); + procedure lblStoffbergClick(Sender: TObject); +- procedure lblGmaqClick(Sender: TObject); + procedure lblURLZeranoClick(Sender: TObject); + procedure lblWeatherfordClick(Sender: TObject); + procedure lblURLWinffOrgClick(Sender: TObject); +@@ -126,7 +125,7 @@ + lbThanks.items.add(rsLaunchpadContrib); + + frmAbout.lblWinff.Caption := StringReplace(frmAbout.lblWinff.Caption, '%s', '1.5.5',[]); +- frmAbout.lblCopyright.Caption := StringReplace(frmAbout.lblCopyright.Caption, '%s', '2006-2016',[]); ++ frmAbout.lblCopyright.Caption := StringReplace(frmAbout.lblCopyright.Caption, '%s', '2006-2022',[]); + end; + + procedure TfrmAbout.lblBellardClick(Sender: TObject); +@@ -136,22 +135,17 @@ + + procedure TfrmAbout.lblGeversClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/'); ++ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff'); + end; + + procedure TfrmAbout.lblStoffbergClick(Sender: TObject); + begin +-frmMain.LaunchBrowser('http://istoff.blogspot.com'); +-end; +- +-procedure TfrmAbout.lblGmaqClick(Sender: TObject); +-begin +- frmMain.LaunchBrowser('http://www.bandshed.net/'); ++frmMain.LaunchBrowser('https://istoff.blogspot.com'); + end; + + procedure TfrmAbout.lblURLZeranoClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com'); ++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/'); + end; + + procedure TfrmAbout.btnOkClick(Sender: TObject); +@@ -161,22 +155,22 @@ + + procedure TfrmAbout.lblWeatherfordClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://www.biggmatt.com'); ++ frmMain.LaunchBrowser('https://www.biggmatt.com/p/winff.html'); + end; + + procedure TfrmAbout.lblURLWinffOrgClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://www.winff.org'); ++ frmMain.LaunchBrowser('https://github.com/WinFF/winff'); + end; + + procedure TfrmAbout.lblURLffmpegClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://ffmpeg.org/'); ++ frmMain.LaunchBrowser('https://ffmpeg.org/'); + end; + + procedure TfrmAbout.lblwinbuildsClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/'); ++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds/'); + end; + + procedure TfrmAbout.lblWindowsBuildsClick(Sender: TObject); diff --git a/multimedia/winff/patches/unit4_pas.patch b/multimedia/winff/patches/unit4_pas.patch new file mode 100644 index 000000000000..82d8c55aff53 --- /dev/null +++ b/multimedia/winff/patches/unit4_pas.patch @@ -0,0 +1,11 @@ +--- unit4.pas 2022-09-03 11:44:10.000000000 +0530 ++++ unit4.pas 2022-09-18 21:21:08.879978117 +0530 +@@ -2,7 +2,7 @@ + + // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/unit5_pas.patch b/multimedia/winff/patches/unit5_pas.patch new file mode 100644 index 000000000000..3614c8b2f01f --- /dev/null +++ b/multimedia/winff/patches/unit5_pas.patch @@ -0,0 +1,11 @@ +--- unit5.pas 2022-09-03 11:44:10.000000000 +0530 ++++ unit5.pas 2022-09-18 21:22:49.145977829 +0530 +@@ -2,7 +2,7 @@ + + // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/unit6_pas.patch b/multimedia/winff/patches/unit6_pas.patch new file mode 100644 index 000000000000..9cc9df6d0281 --- /dev/null +++ b/multimedia/winff/patches/unit6_pas.patch @@ -0,0 +1,11 @@ +--- unit6.pas 2022-09-03 11:44:10.000000000 +0530 ++++ unit6.pas 2022-09-18 21:24:18.544977572 +0530 +@@ -2,7 +2,7 @@ + + // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/winff_1.patch b/multimedia/winff/patches/winff_1.patch new file mode 100644 index 000000000000..3d30a7574e56 --- /dev/null +++ b/multimedia/winff/patches/winff_1.patch @@ -0,0 +1,15 @@ +--- winff-1/winff/winff.1 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/winff.1 2022-09-22 22:28:25.665975741 +0530 +@@ -25,10 +25,11 @@ + .PP + WinFF is a graphical user interface for the command line video converter ffmpeg or avconv\. It runs ffmpeg or avconv from the command line\. So, you just pick your files and it does the rest\. + .PP +-WinFF doesn\'t actually convert any video files\. It just runs ffmpeg or avconv\. Therefore, It will convert any video file that ffmpeg or avconv will convert\. Conversely, if ffmpeg or avconv will not convert the file, then WinFF will not either\. ++WinFF doesn't actually convert any video files\. It just runs ffmpeg or avconv\. Therefore, It will convert any video file that ffmpeg or avconv will convert\. Conversely, if ffmpeg or avconv will not convert the file, then WinFF will not either\. + .SH "SEE ALSO" + .PP + For more details, you should have a look at the pdf manual, available at /usr/share/doc/winff/winff\.pdf ++In Slackware the Manual is available at /usr/doc/winff\-\$\VERSION/winff\.pdf + .SH "AUTHOR" + .PP + This manual page was written by Paul Gevers diff --git a/multimedia/winff/patches/winff_en_GB_po.patch b/multimedia/winff/patches/winff_en_GB_po.patch new file mode 100644 index 000000000000..2fe16e080188 --- /dev/null +++ b/multimedia/winff/patches/winff_en_GB_po.patch @@ -0,0 +1,69 @@ +--- winff-1/winff/languages/winff.en_GB.po 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/languages/winff.en_GB.po 2022-09-22 15:45:52.312998805 +0530 +@@ -73,8 +73,8 @@ + + #: tfrmabout.lblschwarz.caption + msgctxt "TFRMABOUT.LBLSCHWARZ.CAPTION" +-msgid "Kyle Schwarz" +-msgstr "Kyle Schwarz" ++msgid "Gyan Doshi" ++msgstr "Gyan Doshi" + + #: tfrmabout.lblstoffberg.caption + msgid "Ian Stoffberg" +@@ -82,17 +82,17 @@ + + #: tfrmabout.lblurlffmpeg.caption + msgctxt "TFRMABOUT.LBLURLFFMPEG.CAPTION" +-msgid "http://ffmpeg.org" +-msgstr "http://ffmpeg.org" ++msgid "https://ffmpeg.org" ++msgstr "https://ffmpeg.org" + + #: tfrmabout.lblurlwinfforg.caption + msgctxt "TFRMABOUT.LBLURLWINFFORG.CAPTION" +-msgid "http://www.winff.org" +-msgstr "http://www.winff.org" ++msgid "https://github.com/WinFF/winff" ++msgstr "https://github.com/WinFF/winff" + + #: tfrmabout.lblurlzeranoe.caption +-msgid "http://ffmpeg.zeranoe.com" +-msgstr "http://ffmpeg.zeranoe.com" ++msgid "https://www.gyan.dev/ffmpeg/" ++msgstr "https://www.gyan.dev/ffmpeg/" + + #: tfrmabout.lblweatherford.caption + msgid "Matthew Weatherford" +@@ -502,16 +502,16 @@ + msgstr "X" + + #: tfrmmain.lblapplytoall.caption +-msgid "Apply to All" +-msgstr "" ++msgid "Apply_to_All" ++msgstr "Apply_to_All" + + #: tfrmmain.lblaspectratio.caption + msgid "Aspect Ratio" + msgstr "Aspect Ratio" + + #: tfrmmain.lblcancelchanges.caption +-msgid "Cancel Changes" +-msgstr "Cancel Changes" ++msgid "Cancel_Changes" ++msgstr "Cancel_Changes" + + #: tfrmmain.lblcropbottom.caption + msgid "Bottom" +@@ -538,8 +538,8 @@ + msgstr "" + + #: tfrmmain.lblsavechanges.caption +-msgid "Apply Changes" +-msgstr "Apply Changes" ++msgid "Apply_Changes" ++msgstr "Apply_Changes" + + #: tfrmmain.lblsavechanges.hint + msgid "Click here to apply settings changes to the file conversion above" diff --git a/multimedia/winff/patches/winff_lpi.patch b/multimedia/winff/patches/winff_lpi.patch new file mode 100644 index 000000000000..3a709f7b9313 --- /dev/null +++ b/multimedia/winff/patches/winff_lpi.patch @@ -0,0 +1,32 @@ +--- winff-1/winff/winff.lpi 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/winff.lpi 2022-09-23 15:25:23.822970637 +0530 +@@ -20,7 +20,7 @@ + <MajorVersionNr Value="1"/> + <MinorVersionNr Value="5"/> + <RevisionNr Value="5"/> +- <StringTable CompanyName="WinFF.org" FileDescription="WinFF Video Converter" InternalName="winff" LegalCopyright="Copyright 2006-2016 Matthew Weatherford" OriginalFilename="winff.exe" ProductVersion=""/> ++ <StringTable CompanyName="WinFF.org" FileDescription="WinFF Video Converter" InternalName="winff" LegalCopyright="Copyright 2006-2022 Matthew Weatherford" OriginalFilename="winff.exe" ProductVersion=""/> + </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> +@@ -117,6 +117,11 @@ + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> ++ <CodeGeneration> ++ <Optimizations> ++ <OptimizationLevel Value="2"/> ++ </Optimizations> ++ </CodeGeneration> + <Linking> + <Debugging> + <DebugInfoType Value="dsStabs"/> +@@ -124,7 +129,7 @@ + <LinkSmart Value="True"/> + <Options> + <PassLinkerOptions Value="True"/> +- <LinkerOptions Value="--as-needed"/> ++ <LinkerOptions Value="--as-needed -zrelro -znow"/> + <Win32> + <GraphicApplication Value="True"/> + </Win32> diff --git a/multimedia/winff/patches/winff_lpr.patch b/multimedia/winff/patches/winff_lpr.patch new file mode 100644 index 000000000000..c506f8aa1f2f --- /dev/null +++ b/multimedia/winff/patches/winff_lpr.patch @@ -0,0 +1,11 @@ +--- winff.lpr 2022-09-03 11:44:10.000000000 +0530 ++++ winff.lpr 2022-09-18 21:33:05.256976060 +0530 +@@ -1,7 +1,7 @@ + program winff; + + // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/winff_po.patch b/multimedia/winff/patches/winff_po.patch new file mode 100644 index 000000000000..24a23c4c6f17 --- /dev/null +++ b/multimedia/winff/patches/winff_po.patch @@ -0,0 +1,58 @@ +--- winff-1/winff/languages/winff.po 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/languages/winff.po 2022-09-19 21:35:32.946987563 +0530 +@@ -69,7 +69,7 @@ + + #: tfrmabout.lblschwarz.caption + msgctxt "TFRMABOUT.LBLSCHWARZ.CAPTION" +-msgid "Kyle Schwarz" ++msgid "Gyan Doshi" + msgstr "" + + #: tfrmabout.lblstoffberg.caption +@@ -78,16 +78,16 @@ + + #: tfrmabout.lblurlffmpeg.caption + msgctxt "TFRMABOUT.LBLURLFFMPEG.CAPTION" +-msgid "http://ffmpeg.org" ++msgid "https://ffmpeg.org" + msgstr "" + + #: tfrmabout.lblurlwinfforg.caption + msgctxt "TFRMABOUT.LBLURLWINFFORG.CAPTION" +-msgid "http://www.winff.org" ++msgid "https://github.com/WinFF/winff" + msgstr "" + + #: tfrmabout.lblurlzeranoe.caption +-msgid "http://ffmpeg.zeranoe.com" ++msgid "https://www.gyan.dev/ffmpeg/" + msgstr "" + + #: tfrmabout.lblweatherford.caption +@@ -476,7 +476,7 @@ + msgstr "" + + #: tfrmmain.lblapplytoall.caption +-msgid "Apply to All" ++msgid "Apply_to_All" + msgstr "" + + #: tfrmmain.lblaspectratio.caption +@@ -484,7 +484,7 @@ + msgstr "" + + #: tfrmmain.lblcancelchanges.caption +-msgid "Cancel Changes" ++msgid "Cancel_Changes" + msgstr "" + + #: tfrmmain.lblcropbottom.caption +@@ -512,7 +512,7 @@ + msgstr "" + + #: tfrmmain.lblsavechanges.caption +-msgid "Apply Changes" ++msgid "Apply_Changes" + msgstr "" + + #: tfrmmain.lblsavechanges.hint diff --git a/multimedia/winff/patches/winff_pot.patch b/multimedia/winff/patches/winff_pot.patch new file mode 100644 index 000000000000..aade91be2e86 --- /dev/null +++ b/multimedia/winff/patches/winff_pot.patch @@ -0,0 +1,58 @@ +--- winff-1/winff/languages/winff.pot 2022-09-03 11:44:10.000000000 +0530 ++++ winff-2/winff/languages/winff.pot 2022-09-19 21:43:46.489986146 +0530 +@@ -69,7 +69,7 @@ + + #: tfrmabout.lblschwarz.caption + msgctxt "TFRMABOUT.LBLSCHWARZ.CAPTION" +-msgid "Kyle Schwarz" ++msgid "Gyan Doshi" + msgstr "" + + #: tfrmabout.lblstoffberg.caption +@@ -78,16 +78,16 @@ + + #: tfrmabout.lblurlffmpeg.caption + msgctxt "TFRMABOUT.LBLURLFFMPEG.CAPTION" +-msgid "http://ffmpeg.org" ++msgid "https://ffmpeg.org" + msgstr "" + + #: tfrmabout.lblurlwinfforg.caption + msgctxt "TFRMABOUT.LBLURLWINFFORG.CAPTION" +-msgid "http://www.winff.org" ++msgid "https://github.com/WinFF/winff" + msgstr "" + + #: tfrmabout.lblurlzeranoe.caption +-msgid "http://ffmpeg.zeranoe.com" ++msgid "https://www.gyan.dev/ffmpeg/" + msgstr "" + + #: tfrmabout.lblweatherford.caption +@@ -476,7 +476,7 @@ + msgstr "" + + #: tfrmmain.lblapplytoall.caption +-msgid "Apply to All" ++msgid "Apply_to_All" + msgstr "" + + #: tfrmmain.lblaspectratio.caption +@@ -484,7 +484,7 @@ + msgstr "" + + #: tfrmmain.lblcancelchanges.caption +-msgid "Cancel Changes" ++msgid "Cancel_Changes" + msgstr "" + + #: tfrmmain.lblcropbottom.caption +@@ -512,7 +512,7 @@ + msgstr "" + + #: tfrmmain.lblsavechanges.caption +-msgid "Apply Changes" ++msgid "Apply_Changes" + msgstr "" + + #: tfrmmain.lblsavechanges.hint diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild index 3ba18da67427..8f7b6ace1040 100644 --- a/multimedia/winff/winff.SlackBuild +++ b/multimedia/winff/winff.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=winff VERSION=${VERSION:-20220903_8e4491b} LONGNAM=${LONGNAM:-8e4491be149031916053378d859ce156cf9b43d3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,37 +83,37 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -echo "Replacing Dead Links, See README for Details" - -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit1.pas -sed -i 's+http://www.winff.org/forums/+https://github.com/WinFF/winff/issues+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit1.pas -sed -i 's+'http://www.winff.org'+'https://github.com/WinFF/winff'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit1.pas -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit2.pas -sed -i 's+'http://www.winff.org'+'https://github.com/WinFF/winff'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.lfm -sed -i 's#Kyle Schwarz#Gyan Doshi#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.lfm -sed -i 's+'http://ffmpeg.org'+'https://www.ffmpeg.org'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.lfm -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's#'https://launchpad.net/~paul-climbing/+archive/ppa/'#'https://tracker.debian.org/pkg/winff'#g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://ffmpeg.org'+'https://www.ffmpeg.org'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://www.biggmatt.com'+'https://www.biggmatt.com/p/winff.html'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://www.bandshed.net/'+'https://www.bandshed.net/'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://istoff.blogspot.com'+'https://istoff.blogspot.com/'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://ffmpeg.zeranoe.com'+'https://www.gyan.dev/ffmpeg/'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://www.winff.org'+'https://github.com/WinFF/winff'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's+'http://ffmpeg.zeranoe.com/builds/'+'https://www.gyan.dev/ffmpeg/builds/'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit3.pas -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit4.pas -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit5.pas -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit6.pas -sed -i 's+"WinFF.org"+"github.com/WinFF/winff"+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpi -sed -i 's#http://winff.org#https://github.com/WinFF/winff#' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr - -echo "Correcting the hardcoded Documentation location for Slackware" - -sed -i 's+'/usr/share/doc/winff/WinFF.'+'/usr/doc/winff-20220903_8e4491b/WinFF.'+g' $TMP/$PRGNAM-$LONGNAM/$PRGNAM/unit1.pas - -echo "Building WinFF" - -lazbuild --lazarusdir=/usr/share/lazarus --cpu=$ARCH -B $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr +echo "Patching Winff, See README and changelog for Details" + +cd $PRGNAM + +patch --verbose --unified < $CWD/patches/unit1_lfm.patch +patch --verbose --unified < $CWD/patches/unit1_pas.patch +patch --verbose --unified < $CWD/patches/unit2_pas.patch +patch --verbose --unified < $CWD/patches/unit3_lfm.patch +patch --verbose --unified < $CWD/patches/unit3_pas.patch +patch --verbose --unified < $CWD/patches/unit4_pas.patch +patch --verbose --unified < $CWD/patches/unit5_pas.patch +patch --verbose --unified < $CWD/patches/unit6_pas.patch +patch --verbose --unified < $CWD/patches/winff_lpi.patch +patch --verbose --unified < $CWD/patches/winff_lpr.patch +patch --verbose --unified < $CWD/patches/winff_1.patch + +echo "Patching the languages file" + +find languages -type f -not \( -name 'winff.po' -or -name 'winff.pot' -or -name 'winff.en_GB.po' \) -delete + +cd languages + +patch --verbose --unified < $CWD/patches/winff_po.patch +patch --verbose --unified < $CWD/patches/winff_pot.patch +patch --verbose --unified < $CWD/patches/winff_en_GB_po.patch + +cd ../.. + +echo "Building WinFF with QT5 Widget insted of GTK" + +lazbuild --lazarusdir=/usr/share/lazarus --widgetset=qt5 --cpu=$ARCH -B $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr install -m 0755 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM diff --git a/multimedia/winff/winff.info b/multimedia/winff/winff.info index a71dbf036957..3cee2a0174bc 100644 --- a/multimedia/winff/winff.info +++ b/multimedia/winff/winff.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/WinFF/winff/archive/8e4491b/winff-8e4491be149031916 MD5SUM="25bb9853f870c827ef80f2efba1f7219" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lazarus" +REQUIRES="libqtpas lazarus" MAINTAINER="Vijay Marcel" EMAIL="vijaymarcel@outlook.com" |