diff --git a/config/functions b/config/functions index ab4f6bc2f..9b7c1d868 100644 --- a/config/functions +++ b/config/functions @@ -545,7 +545,7 @@ debug_strip() { fi if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then - find $* -type f -executable | xargs $STRIP 2>/dev/null || : + find $* -type f \( -executable ! -iname "*.AppImage" \) | xargs $STRIP 2>/dev/null || : fi } diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/PCSX2-reg.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/PCSX2-reg.ini new file mode 100644 index 000000000..055c56549 --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/PCSX2-reg.ini @@ -0,0 +1,6 @@ +DocumentsFolderMode=User +CustomDocumentsFolder=/storage/.config/PCSX2 +UseDefaultSettingsFolder=enabled +SettingsFolder=/storage/.config/PCSX2/inis +Install_Dir=/usr/bin +RunWizard=0 diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/DEV9Hosts.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/DEV9Hosts.ini new file mode 100644 index 000000000..41c43591c --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/DEV9Hosts.ini @@ -0,0 +1,5 @@ +[Host0] +Url=www.example.com +Desc=Set DNS to 192.0.2.1 to use this host list +Address=0.0.0.0 +Enabled=disabled diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/GS.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/GS.ini new file mode 100644 index 000000000..934150a54 --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/GS.ini @@ -0,0 +1,93 @@ +DisableDualSourceBlend = 0 +DisableFramebufferFetch = 0 +DumpDirectTextures = 1 +DumpPaletteTextures = 1 +DumpReplaceableMipmaps = 0 +DumpReplaceableTextures = 0 +DumpTexturesWithFMVActive = 0 +GSDumpCompression = 0 +HWDisableReadbacks = 0 +IntegerScaling = 0 +LoadTextureReplacements = 0 +LoadTextureReplacementsAsync = 1 +MaxAnisotropy = 0 +OsdScale = 100 +OsdShowCPU = 0 +OsdShowFPS = 0 +OsdShowGPU = 0 +OsdShowGSStats = 0 +OsdShowIndicators = 1 +OsdShowMessages = 1 +OsdShowResolution = 0 +OsdShowSpeed = 0 +OverrideGeometryShaders = -1 +OverrideTextureBarriers = -1 +PrecacheTextureReplacements = 0 +Renderer = 14 +ShadeBoost = 0 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +SkipDuplicateFrames = 0 +TVShader = 0 +ThreadedPresentation = 0 +UseBlitSwapChain = 0 +UseDebugDevice = 0 +UserHacks = 0 +UserHacks_AutoFlush = 0 +UserHacks_CPUSpriteRenderBW = 0 +UserHacks_CPU_FB_Conversion = 0 +UserHacks_DisableDepthSupport = 0 +UserHacks_DisablePartialInvalidation = 0 +UserHacks_Disable_Safe_Features = 0 +UserHacks_HalfPixelOffset = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_SkipDraw_End = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_TextureInsideRt = 0 +UserHacks_TriFilter = -1 +UserHacks_WildHack = 0 +UserHacks_align_sprite_X = 0 +UserHacks_merge_pp_sprite = 0 +UserHacks_round_sprite_offset = 0 +accurate_blending_unit = 1 +accurate_date = 1 +autoflush_sw = 1 +crc_hack_level = -1 +deinterlace = 7 +disable_hw_gl_draw = 0 +disable_interlace_offset = 0 +disable_shader_cache = 0 +dithering_ps2 = 2 +dump = 0 +extrathreads = 2 +extrathreads_height = 4 +filter = 2 +fxaa = 0 +linear_present = 1 +mipmap = 1 +mipmap_hw = -1 +override_GL_ARB_clear_texture = -1 +override_GL_ARB_direct_state_access = -1 +override_GL_ARB_gpu_shader5 = -1 +override_GL_ARB_shader_image_load_store = -1 +override_GL_ARB_texture_barrier = -1 +paltex = 0 +pcrtc_antiblur = 1 +pcrtc_offsets = 0 +pcrtc_overscan = 0 +preload_frame_with_gs_data = 0 +save = 0 +savef = 0 +savel = 5000 +saven = 0 +savet = 0 +savez = 0 +shaderfx = 0 +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx +texture_preloading = 2 +upscale_multiplier = 1 +wrap_gs_mem = 0 diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PAD.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PAD.ini new file mode 100644 index 000000000..ed07e6328 --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PAD.ini @@ -0,0 +1,6 @@ +first_time_wizard = 1 +options = 0 +mouse_sensibility = 100 +ff_intensity = 1 +uid[0] = 0 +uid[1] = 0 diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2.ini new file mode 100644 index 000000000..56aa33855 --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2.ini @@ -0,0 +1,434 @@ +[UI] +SettingsVersion = 1 +InhibitScreensaver = true +ConfirmShutdown = true +StartPaused = false +PauseOnFocusLoss = false +StartFullscreen = true +DoubleClickTogglesFullscreen = true +HideMouseCursor = false +RenderToSeparateWindow = false +HideMainWindowWhenRunning = false +DisableWindowResize = false +Theme = darkfusion +MainWindowGeometry = AdnQywADAAAAAAAAAAAAFAAABP8AAALjAAAAAAAAABQAAAO1AAACkwAAAAAABAAABQAAAAAAAAAAFAAABP8AAALj +MainWindowState = AAAA/wAAAAD9AAAAAAAABQAAAAK9AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA== +ShowStatusBar = false + + +[Folders] +Bios = /storage/roms/bios +Snapshots = snaps +Savestates = sstates +MemoryCards = memcards +Logs = logs +Cheats = cheats +CheatsWS = cheats_ws +CheatsNI = cheats_ni +Cache = cache +Textures = textures +InputProfiles = inputprofiles + + +[EmuCore] +CdvdVerboseReads = false +CdvdDumpBlocks = false +CdvdShareWrite = false +EnablePatches = true +EnableCheats = false +EnablePINE = false +EnableWideScreenPatches = false +EnableNoInterlacingPatches = false +EnableRecordingTools = true +EnableGameFixes = true +SaveStateOnShutdown = false +ConsoleToStdio = false +HostFs = false +BackupSavestate = true +SavestateZstdCompression = true +McdEnableEjection = true +McdFolderAutoManage = true +WarnAboutUnsafeSettings = true +GzipIsoIndexTemplate = $(f).pindex.tmp +BlockDumpSaveDirectory = +EnableFastBoot = true + + +[EmuCore/Speedhacks] +EECycleRate = 0 +EECycleSkip = 0 +fastCDVD = false +IntcStat = true +WaitLoop = true +vuFlagHack = true +vuThread = true +vu1Instant = true + + +[EmuCore/CPU] +FPU.DenormalsAreZero = true +FPU.FlushToZero = true +FPU.Roundmode = 3 +AffinityControlMode = 0 +VU.DenormalsAreZero = true +VU.FlushToZero = true +VU.Roundmode = 3 + + +[EmuCore/CPU/Recompiler] +EnableEE = true +EnableIOP = true +EnableEECache = false +EnableVU0 = true +EnableVU1 = true +vuOverflow = true +vuExtraOverflow = false +vuSignOverflow = false +vuUnderflow = false +fpuOverflow = true +fpuExtraOverflow = false +fpuFullMode = false +StackFrameChecks = false +PreBlockCheckEE = false +PreBlockCheckIOP = false + + +[EmuCore/GS] +VsyncQueueSize = 2 +FrameLimitEnable = true +VsyncEnable = 1 +FramerateNTSC = 59.939999 +FrameratePAL = 50.000000 +SyncToHostRefreshRate = false +AspectRatio = Auto 4:3/3:2 +FMVAspectRatioSwitch = Off +Zoom = 100.000000 +StretchY = 100.000000 +CropLeft = 0 +CropTop = 0 +CropRight = 0 +CropBottom = 0 +pcrtc_antiblur = true +disable_interlace_offset = false +pcrtc_offsets = false +pcrtc_overscan = false +IntegerScaling = false +linear_present = true +UseDebugDevice = false +UseBlitSwapChain = false +disable_shader_cache = false +DisableDualSourceBlend = false +DisableFramebufferFetch = false +ThreadedPresentation = false +SkipDuplicateFrames = false +OsdShowMessages = true +OsdShowSpeed = true +OsdShowFPS = true +OsdShowCPU = true +OsdShowGPU = true +OsdShowResolution = true +OsdShowGSStats = true +OsdShowIndicators = true +HWDisableReadbacks = false +paltex = false +autoflush_sw = true +preload_frame_with_gs_data = false +wrap_gs_mem = false +mipmap = true +UserHacks = false +UserHacks_align_sprite_X = false +UserHacks_AutoFlush = false +UserHacks_CPU_FB_Conversion = false +UserHacks_DisableDepthSupport = false +UserHacks_DisablePartialInvalidation = false +UserHacks_Disable_Safe_Features = false +UserHacks_merge_pp_sprite = false +UserHacks_WildHack = false +UserHacks_TextureInsideRt = false +fxaa = false +ShadeBoost = false +shaderfx = false +dump = false +save = false +savef = false +savet = false +savez = false +DumpReplaceableTextures = false +DumpReplaceableMipmaps = false +DumpTexturesWithFMVActive = false +DumpDirectTextures = true +DumpPaletteTextures = true +LoadTextureReplacements = false +LoadTextureReplacementsAsync = true +PrecacheTextureReplacements = false +deinterlace = 7 +OsdScale = 100 +Renderer = 14 +upscale_multiplier = 1 +mipmap_hw = -1 +accurate_blending_unit = 1 +crc_hack_level = -1 +filter = 2 +texture_preloading = 2 +GSDumpCompression = 1 +dithering_ps2 = 2 +MaxAnisotropy = 0 +extrathreads = 2 +extrathreads_height = 4 +TVShader = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_SkipDraw_End = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_HalfPixelOffset = 0 +UserHacks_round_sprite_offset = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_CPUSpriteRenderBW = 0 +UserHacks_TriFilter = -1 +OverrideTextureBarriers = -1 +OverrideGeometryShaders = -1 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +saven = 0 +savel = 5000 +Adapter = +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx + + +[SPU2/Mixing] +Interpolation = 5 +FinalVolume = 100 +VolumeAdjustC = 0.000000 +VolumeAdjustFL = 0.000000 +VolumeAdjustFR = 0.000000 +VolumeAdjustBL = 0.000000 +VolumeAdjustBR = 0.000000 +VolumeAdjustSL = 0.000000 +VolumeAdjustSR = 0.000000 +VolumeAdjustLFE = 0.000000 + + +[SPU2/Output] +OutputModule = cubeb +Latency = 100 +SynchMode = 0 +SpeakerConfiguration = 0 +DplDecodingLevel = 0 + + +[DEV9/Eth] +EthEnable = false +EthApi = Unset +EthDevice = +EthLogDNS = false +InterceptDHCP = false +PS2IP = 0.0.0.0 +Mask = 0.0.0.0 +Gateway = 0.0.0.0 +DNS1 = 0.0.0.0 +DNS2 = 0.0.0.0 +AutoMask = true +AutoGateway = true +ModeDNS1 = Auto +ModeDNS2 = Auto + + +[DEV9/Eth/Hosts] +Count = 0 + + +[DEV9/Hdd] +HddEnable = false +HddFile = DEV9hdd.raw +HddSizeSectors = 83886080 + + +[EmuCore/Gamefixes] +VuAddSubHack = false +FpuMulHack = false +FpuNegDivHack = false +XgKickHack = false +EETimingHack = false +SoftwareRendererFMVHack = false +SkipMPEGHack = false +OPHFlagHack = false +DMABusyHack = false +VIFFIFOHack = false +VIF1StallHack = false +GIFFIFOHack = false +GoemonTlbHack = false +IbitHack = false +VUSyncHack = false +VUOverflowHack = false +BlitInternalFPSHack = false + + +[EmuCore/Profiler] +Enabled = false +RecBlocks_EE = true +RecBlocks_IOP = true +RecBlocks_VU0 = true +RecBlocks_VU1 = true + + +[EmuCore/Debugger] +ShowDebuggerOnStart = false +AlignMemoryWindowStart = true +FontWidth = 8 +FontHeight = 12 +WindowWidth = 0 +WindowHeight = 0 +MemoryViewBytesPerRow = 16 + + +[EmuCore/TraceLog] +Enabled = false +EE.bitset = 0 +IOP.bitset = 0 + + +[Filenames] +BIOS = scph39001.bin + + +[Framerate] +NominalScalar = 1.000000 +TurboScalar = 2.000000 +SlomoScalar = 0.500000 + + +[MemoryCards] +Slot1_Enable = true +Slot1_Filename = Mcd001.ps2 +Slot2_Enable = true +Slot2_Filename = Mcd002.ps2 +Multitap1_Slot2_Enable = false +Multitap1_Slot2_Filename = Mcd-Multitap1-Slot02.ps2 +Multitap1_Slot3_Enable = false +Multitap1_Slot3_Filename = Mcd-Multitap1-Slot03.ps2 +Multitap1_Slot4_Enable = false +Multitap1_Slot4_Filename = Mcd-Multitap1-Slot04.ps2 +Multitap2_Slot2_Enable = false +Multitap2_Slot2_Filename = Mcd-Multitap2-Slot02.ps2 +Multitap2_Slot3_Enable = false +Multitap2_Slot3_Filename = Mcd-Multitap2-Slot03.ps2 +Multitap2_Slot4_Enable = false +Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 + + +[Logging] +EnableSystemConsole = false +EnableFileLogging = false +EnableTimestamps = true +EnableVerbose = false +EnableEEConsole = false +EnableIOPConsole = false +EnableInputRecordingLogs = true +EnableControllerLogs = false + + +[InputSources] +Keyboard = true +Mouse = true +SDL = true +SDLControllerEnhancedMode = false + + +[Hotkeys] +ToggleFullscreen = Keyboard/Alt & Keyboard/Return +CycleAspectRatio = Keyboard/F6 +CycleInterlaceMode = Keyboard/F5 +CycleMipmapMode = Keyboard/Insert +GSDumpMultiFrame = Keyboard/Control & Keyboard/Shift & Keyboard/F8 +Screenshot = Keyboard/F8 +GSDumpSingleFrame = Keyboard/Shift & Keyboard/F8 +ToggleSoftwareRendering = Keyboard/F9 +ZoomIn = Keyboard/Control & Keyboard/Plus +ZoomOut = Keyboard/Control & Keyboard/Minus +InputRecToggleMode = Keyboard/Shift & Keyboard/R +LoadStateFromSlot = Keyboard/F3 +SaveStateToSlot = Keyboard/F1 +NextSaveStateSlot = Keyboard/F2 +PreviousSaveStateSlot = Keyboard/Shift & Keyboard/F2 +OpenPauseMenu = Keyboard/Escape +ToggleFrameLimit = Keyboard/F4 +TogglePause = Keyboard/Space +ToggleSlowMotion = Keyboard/Shift & Keyboard/Backtab +ToggleTurbo = Keyboard/Tab +HoldTurbo = Keyboard/Period + + +[Pad] +MultitapPort1 = false +MultitapPort2 = false +PointerXScale = 8.000000 +PointerYScale = 8.000000 + + +[Pad1] +Type = DualShock2 +InvertL = 0 +InvertR = 0 +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +ButtonDeadzone = 0.000000 +PressureModifier = 0.500000 +Up = SDL-0/DPadUp +Right = SDL-0/DPadRight +Down = SDL-0/DPadDown +Left = SDL-0/DPadLeft +Triangle = SDL-0/Y +Circle = SDL-0/B +Cross = SDL-0/A +Square = SDL-0/X +Select = SDL-0/Back +Start = SDL-0/Start +L1 = SDL-0/LeftShoulder +L2 = SDL-0/+LeftTrigger +R1 = SDL-0/RightShoulder +R2 = SDL-0/+RightTrigger +L3 = SDL-0/LeftStick +R3 = SDL-0/RightStick +LUp = SDL-0/-LeftY +LRight = SDL-0/+LeftX +LDown = SDL-0/+LeftY +LLeft = SDL-0/-LeftX +RUp = SDL-0/-RightY +RRight = SDL-0/+RightX +RDown = SDL-0/+RightY +RLeft = SDL-0/-RightX +Analog = SDL-0/Guide +LargeMotor = SDL-0/LargeMotor +SmallMotor = SDL-0/SmallMotor + + +[Pad2] +Type = None + + +[Pad3] +Type = None + + +[Pad4] +Type = None + + +[Pad5] +Type = None + + +[Pad6] +Type = None + + +[Pad7] +Type = None + + +[Pad8] +Type = None diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2_ui.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2_ui.ini new file mode 100644 index 000000000..5ba9e22cc --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2_ui.ini @@ -0,0 +1,157 @@ +MainGuiPosition=93,371 +SysSettingsTabName=Cpu +McdSettingsTabName=none +ComponentsTabName= +AppSettingsTabName=none +GameDatabaseTabName=none +LanguageId=0 +LanguageCode=default +RecentIsoCount=20 +GzipIsoIndexTemplate=$(f).pindex.tmp +Listbook_ImageSize=32 +Toolbar_ImageSize=24 +Toolbar_ShowLabels=enabled +CurrentBlockdump= +CurrentELF= +CurrentIRX= +EnableSpeedHacks=enabled +EnableGameFixes=disabled +EnableFastBoot=enabled +EnablePresets=enabled +PresetIndex=1 +AskOnBoot=disabled +DevMode=disabled +CdvdSource=ISO +[ProgramLog] +Visible=disabled +AutoDock=enabled +DisplayPosition=492,371 +DisplaySize=680,560 +FontSize=8 +Theme=Default +[Folders] +UseDefaultBios=enabled +UseDefaultSnapshots=enabled +UseDefaultSavestates=enabled +UseDefaultMemoryCards=enabled +UseDefaultLogs=enabled +UseDefaultLangs=enabled +UseDefaultCheats=enabled +UseDefaultCheatsWS=enabled +UseDefaultTextures=enabled +Bios=/storage/roms/bios +Snapshots=/storage/roms/screenshots +Savestates=/storage/saves/ps2 +MemoryCards=/storage/saves/ps2 +Logs=/var/log +Langs=/usr/bin/resources/locale +Cheats=/storage/cheats/ps2/cheats +CheatsWS=/storage/cheats/ps2/cheats_ws +Cache=/system/cache/ps2 +Textures=/storage/.config/PCSX2 +RunIso=/storage/PCSX2 +RunELF=/storage/PCSX2 +RunDisc= +[GSWindow] +CloseOnEsc=enabled +DefaultToFullscreen=disabled +AlwaysHideMouse=disabled +DisableResizeBorders=disabled +DisableScreenSaver=enabled +WindowSize=640,480 +WindowPos=0,0 +IsMaximized=disabled +IsFullscreen=disabled +EnableVsyncWindowFlag=disabled +IsToggleFullscreenOnDoubleClick=enabled +SyncToHostRefreshRate=disabled +AspectRatio=Auto 4:3/3:2 (Progressive) +FMVAspectRatioSwitch=Off +Zoom=100 +[InputRecording] +VirtualPadPosition=-1,-1 +m_frame_advance_amount=1 +[Capture] +EnableAudio=enabled +[UiTemplates] +LimiterUnlimited=Max +LimiterTurbo=Turbo +LimiterSlowmo=Slowmo +LimiterNormal=Normal +OutputFrame=Frame +OutputField=Field +OutputProgressive=Progressive +OutputInterlaced=Interlaced +Paused= +TitleTemplate=Slot: ${slot} | Speed: ${speed} (${vfps}) | ${videomode} | Limiter: ${limiter} | ${gs} | ${omodei} | ${cpuusage} +RecordingTemplate=Slot: ${slot} | Frame: ${frame}/${maxFrame} | Rec. Mode: ${mode} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} +[MemoryCards] +Slot1_Enable=enabled +Slot1_Filename=Mcd001.ps2 +Slot2_Enable=enabled +Slot2_Filename=Mcd002.ps2 +Multitap1_Slot2_Enable=disabled +Multitap1_Slot2_Filename=Mcd-Multitap1-Slot02.ps2 +Multitap1_Slot3_Enable=disabled +Multitap1_Slot3_Filename=Mcd-Multitap1-Slot03.ps2 +Multitap1_Slot4_Enable=disabled +Multitap1_Slot4_Filename=Mcd-Multitap1-Slot04.ps2 +Multitap2_Slot2_Enable=disabled +Multitap2_Slot2_Filename=Mcd-Multitap2-Slot02.ps2 +Multitap2_Slot3_Enable=disabled +Multitap2_Slot3_Filename=Mcd-Multitap2-Slot03.ps2 +Multitap2_Slot4_Enable=disabled +Multitap2_Slot4_Filename=Mcd-Multitap2-Slot04.ps2 +[Filenames] +BIOS=scph39001.bin +[Framerate] +NominalScalar=1 +TurboScalar=2 +SlomoScalar=0.5 +[ConsoleLogSources] +Devel=disabled +.EEout=enabled +.IOPout=enabled +.EErecPerf=disabled +.ELF=disabled +.SysEvents=disabled +.p\&xThread=disabled +.SYSout=disabled +.PGIFout=disabled +.Input\ Recording=disabled +.Controller\ Info=disabled +[TraceLogSources] +.SIF=disabled +EE.Bios=disabled +EE.Memory=disabled +EE.Disasm.R5900=disabled +EE.Disasm.COP0=disabled +EE.Disasm.FPU=disabled +EE.Disasm.VUmacro=disabled +EE.Disasm.Cache=disabled +EE.Registers.HwRegs=disabled +EE.Registers.UnknownRegs=disabled +EE.Registers.DmaRegs=disabled +EE.Registers.IPU=disabled +EE.GIFtags=disabled +EE.VIFcodes=disabled +EE.MSKPATH3=disabled +EE.Events.DmaCtrl=disabled +EE.Events.Counters=disabled +EE.Events.MFIFO=disabled +EE.Events.VIF=disabled +EE.Events.GIF=disabled +IOP.Bios=disabled +IOP.Memorycards=disabled +IOP.Pad=disabled +IOP.Disasm.R3000A=disabled +IOP.Disasm.Memory=disabled +IOP.Registers.HwRegs=disabled +IOP.Registers.UnknownRegs=disabled +IOP.Registers.DmaRegs=disabled +IOP.Events.DmaCrl=disabled +IOP.Events.Counters=disabled +IOP.Events.CDVD=disabled +IOP.Events.MDEC=disabled +[TraceLogSources/IOP.Disasm.COP2] +GPU=disabled diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2_vm.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2_vm.ini new file mode 100644 index 000000000..3cda500f6 --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/PCSX2_vm.ini @@ -0,0 +1,116 @@ +[EmuCore] +CdvdVerboseReads=disabled +CdvdDumpBlocks=disabled +CdvdShareWrite=disabled +EnablePatches=enabled +EnableCheats=disabled +EnablePINE=disabled +EnableWideScreenPatches=disabled +EnableNoInterlacingPatches=disabled +EnableRecordingTools=enabled +ConsoleToStdio=disabled +HostFs=disabled +PatchBios=disabled +PatchRegion= +BackupSavestate=enabled +SavestateZstdCompression=enabled +McdEnableEjection=enabled +McdFolderAutoManage=enabled +MultitapPort0_Enabled=disabled +MultitapPort1_Enabled=disabled +GzipIsoIndexTemplate=$(f).pindex.tmp +[EmuCore/Speedhacks] +EECycleRate=0 +EECycleSkip=0 +fastCDVD=disabled +IntcStat=enabled +WaitLoop=enabled +vuFlagHack=enabled +vuThread=disabled +vu1Instant=enabled +[EmuCore/CPU] +FPU.DenormalsAreZero=enabled +FPU.FlushToZero=enabled +FPU.Roundmode=3 +AffinityControlMode=0 +VU.DenormalsAreZero=enabled +VU.FlushToZero=enabled +VU.Roundmode=3 +[EmuCore/CPU/Recompiler] +EnableEE=enabled +EnableIOP=enabled +EnableEECache=disabled +EnableVU0=enabled +EnableVU1=enabled +vuOverflow=enabled +vuExtraOverflow=disabled +vuSignOverflow=disabled +vuUnderflow=disabled +fpuOverflow=enabled +fpuExtraOverflow=disabled +fpuFullMode=disabled +StackFrameChecks=disabled +PreBlockCheckEE=disabled +PreBlockCheckIOP=disabled +[EmuCore/GS] +VsyncQueueSize=2 +FrameLimitEnable=enabled +VsyncEnable=0 +FramerateNTSC=59.94 +FrameratePAL=50 +[EmuCore/Gamefixes] +VuAddSubHack=disabled +FpuMulHack=disabled +FpuNegDivHack=disabled +XgKickHack=disabled +EETimingHack=disabled +SoftwareRendererFMVHack=disabled +SkipMPEGHack=disabled +OPHFlagHack=disabled +DMABusyHack=disabled +VIFFIFOHack=disabled +VIF1StallHack=disabled +GIFFIFOHack=disabled +GoemonTlbHack=disabled +IbitHack=disabled +VUSyncHack=disabled +VUOverflowHack=disabled +BlitInternalFPSHack=disabled +[EmuCore/Profiler] +Enabled=disabled +RecBlocks_EE=enabled +RecBlocks_IOP=enabled +RecBlocks_VU0=enabled +RecBlocks_VU1=enabled +[EmuCore/Debugger] +ShowDebuggerOnStart=disabled +AlignMemoryWindowStart=enabled +FontWidth=8 +FontHeight=12 +WindowWidth=1000 +WindowHeight=720 +MemoryViewBytesPerRow=16 +[EmuCore/TraceLog] +Enabled=disabled +EE.bitset=0 +IOP.bitset=0 +[DEV9] +[DEV9/Eth] +EthEnable=disabled +EthApi=Unset +EthDevice= +EthLogDNS=disabled +InterceptDHCP=disabled +PS2IP=0.0.0.0 +Mask=0.0.0.0 +Gateway=0.0.0.0 +DNS1=0.0.0.0 +DNS2=0.0.0.0 +AutoMask=enabled +AutoGateway=enabled +ModeDNS1=Auto +ModeDNS2=Auto +[DEV9/Hdd] +HddEnable=disabled +HddFile=DEV9hdd.raw +HddSizeSectors=83886080 diff --git a/packages/games/emulators/pcsx2sa/config/PCSX2/inis/SPU2.ini b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/SPU2.ini new file mode 100644 index 000000000..ecd06b3a1 --- /dev/null +++ b/packages/games/emulators/pcsx2sa/config/PCSX2/inis/SPU2.ini @@ -0,0 +1,43 @@ +[SOUNDTOUCH] +SequenceLengthMS=30 +SeekWindowMS=20 +OverlapMS=10 +[MIXING] +Interpolation=5 +FinalVolume=100 +AdvancedVolumeControl=0 +VolumeAdjustC(dB)=0 +VolumeAdjustFL(dB)=0 +VolumeAdjustFR(dB)=0 +VolumeAdjustBL(dB)=0 +VolumeAdjustBR(dB)=0 +VolumeAdjustSL(dB)=0 +VolumeAdjustSR(dB)=0 +VolumeAdjustLFE(dB)=0 +[OUTPUT] +Output_Module=cubeb +Latency=100 +Synch_Mode=0 +SpeakerConfiguration=0 +[DEBUG] +Global_Enable=0 +Show_Messages=0 +Show_Messages_Key_On_Off=0 +Show_Messages_Voice_Off=0 +Show_Messages_DMA_Transfer=0 +Show_Messages_AutoDMA=0 +Show_Messages_Overruns=0 +Show_Messages_CacheStats=0 +Log_Register_Access=0 +Log_DMA_Transfers=0 +Log_WAVE_Output=0 +Dump_Info=0 +Dump_Memory=0 +Dump_Regs=0 +Access_Log_Filename=SPU2Log.txt +WaveLog_Filename=SPU2log.wav +DMA4Log_Filename=SPU2dma4.dat +DMA7Log_Filename=SPU2dma7.dat +Info_Dump_Filename=SPU2Cores.txt +Mem_Dump_Filename=SPU2mem.dat +Reg_Dump_Filename=SPU2regs.dat diff --git a/packages/games/emulators/pcsx2sa/package.mk b/packages/games/emulators/pcsx2sa/package.mk index e7774f88b..00b75bacd 100644 --- a/packages/games/emulators/pcsx2sa/package.mk +++ b/packages/games/emulators/pcsx2sa/package.mk @@ -2,52 +2,22 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="pcsx2sa" -PKG_VERSION="b96594b17cb362d381e291232b490142fd615382" +PKG_VERSION="v1.7.3329" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/pcsx2/pcsx2" -PKG_URL="${PKG_SITE}.git" -PKG_DEPENDS_TARGET="toolchain alsa-lib freetype zlib libpng libaio libsamplerate libfmt libpcap soundtouch yamlcpp wxwidgets" -PKG_LONGDESC="PS2 Emulator" -GET_HANDLER_SUPPORT="git" - -PKG_PATCH_DIRS+="${DEVICE}" - -if [ ! "${OPENGL}" = "no" ]; then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -fi - -if [ "${OPENGLES_SUPPORT}" = yes ]; then - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi - -if [ "${VULKAN_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers" -fi - -if [ "${DISPLAYSERVER}" = "wl" ]; then - PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}" -fi - -PKG_CMAKE_OPTS_TARGET=" -DwxWidgets_CONFIG_EXECUTABLE=${SYSROOT_PREFIX}/usr/bin/wx-config \ - -DSDL2_API=TRUE \ - -DDISABLE_PCSX2_WRAPPER=1 \ - -DPACKAGE_MODE=FALSE \ - -DPCSX2_TARGET_ARCHITECTURES=x86_64 \ - -DENABLE_TESTS=OFF \ - -DEXTRA_PLUGINS=OFF \ - -DQT_BUILD=FALSE \ - -DBUILD_SHARED_LIBS=OFF \ - -DUSE_SYSTEM_LIBS=OFF \ - -DDISABLE_ADVANCE_SIMD=ON \ - -DUSE_VTUNE=OFF \ - -DUSE_VULKAN=ON \ - -DGTK3_API=FALSE \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=FALSE \ - -DCMAKE_BUILD_TYPE=Release" +PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/pcsx2-${PKG_VERSION}-linux-AppImage-64bit-AVX2-Qt.AppImage" +PKG_LONGDESC="PS2 Emulator appimage" +PKG_TOOLCHAIN="manual" makeinstall_target() { + # Redefine strip or the AppImage will be stripped rendering it unusable. + export STRIP=true mkdir -p ${INSTALL}/usr/bin - cp -rf pcsx2/resources pcsx2/pcsx2 ${INSTALL}/usr/bin + cp ${PKG_BUILD}/${PKG_NAME}-${PKG_VERSION}.AppImage ${INSTALL}/usr/bin/${PKG_NAME} + cp -rf ${PKG_DIR}/sources/start_pcsx2.sh ${INSTALL}/usr/bin + sed -e "s/@APPIMAGE@/${PKG_NAME}/g" -i ${INSTALL}/usr/bin/start_pcsx2.sh + chmod 755 ${INSTALL}/usr/bin/* + mkdir -p ${INSTALL}/usr/config + cp -rf ${PKG_DIR}/config/PCSX2 ${INSTALL}/usr/config } diff --git a/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-always_inline.patch b/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-always_inline.patch deleted file mode 100644 index 100e5995d..000000000 --- a/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-always_inline.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/Pcsx2Defs.h b/common/Pcsx2Defs.h -index 111db24..4c4ad62 100644 ---- a/common/Pcsx2Defs.h -+++ b/common/Pcsx2Defs.h -@@ -119,7 +119,7 @@ static const int __pagesize = PCSX2_PAGESIZE; - #define __vectorcall __fastcall - #define _inline __inline__ __attribute__((unused)) - #ifdef NDEBUG -- #define __forceinline __attribute__((always_inline, unused)) -+ #define __forceinline __attribute__((unused)) - #else - #define __forceinline __attribute__((unused)) - #endif diff --git a/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-fvisibility.patch b/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-fvisibility.patch deleted file mode 100644 index 04fc21d90..000000000 --- a/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-fvisibility.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake -index bb6108619..9c1294a4a 100644 ---- a/cmake/BuildParameters.cmake -+++ b/cmake/BuildParameters.cmake -@@ -214,7 +214,7 @@ option(USE_PGO_OPTIMIZE "Enable PGO optimization (use profile)") - if(MSVC) - add_compile_options("$<$:/Zc:externConstexpr>") - else() -- add_compile_options(-pipe -fvisibility=hidden -pthread -fno-builtin-strcmp -fno-builtin-memcmp -mfpmath=sse) -+ add_compile_options(-pipe -pthread -fno-builtin-strcmp -fno-builtin-memcmp -mfpmath=sse -fno-operator-names) - - # -fno-operator-names should only be for C++ files, not C files. - add_compile_options($<$:-fno-operator-names>) diff --git a/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-headers-gs.patch b/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-headers-gs.patch deleted file mode 100644 index 9ab5be80a..000000000 --- a/packages/games/emulators/pcsx2sa/patches/000-fix-linux-compilation-headers-gs.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp -index 757d7ae..79c4937 100644 ---- a/pcsx2/CDVD/CDVD.cpp -+++ b/pcsx2/CDVD/CDVD.cpp -@@ -25,7 +25,7 @@ - #include "CDVD_internal.h" - #include "CDVDisoReader.h" - --#include "GS.h" // for gsVideoMode -+#include "../GS.h" // for gsVideoMode - #include "Elfheader.h" - #include "ps2/BiosTools.h" - -diff --git a/pcsx2/DebugTools/DebugInterface.cpp b/pcsx2/DebugTools/DebugInterface.cpp -index d29c2b0..2a89378 100644 ---- a/pcsx2/DebugTools/DebugInterface.cpp -+++ b/pcsx2/DebugTools/DebugInterface.cpp -@@ -20,7 +20,7 @@ - #include "R5900.h" - #include "Debug.h" - #include "VU.h" --#include "GS.h" // Required for gsNonMirroredRead() -+#include "../GS.h" // Required for gsNonMirroredRead() - #include "Counters.h" - - #include "R3000A.h" -diff --git a/pcsx2/PAD/Linux/Global.h b/pcsx2/PAD/Linux/Global.h -index 71e4a8a..7754542 100644 ---- a/pcsx2/PAD/Linux/Global.h -+++ b/pcsx2/PAD/Linux/Global.h -@@ -15,6 +15,9 @@ - - #pragma once - -+static const int GAMEPAD_NUMBER = 2; -+static const int MAX_KEYS = 24; -+ - #include - #include - #include -@@ -34,9 +37,6 @@ - - #define PADdefs - --static const u32 GAMEPAD_NUMBER = 2; --static const u32 MAX_KEYS = 24; -- - #include "Config.h" - - enum gamePadValues -diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h -index d9decd7..ade53b9 100644 ---- a/pcsx2/gui/App.h -+++ b/pcsx2/gui/App.h -@@ -36,7 +36,7 @@ - class DisassemblyDialog; - struct HostKeyEvent; - --#include "GS.h" -+#include "../GS.h" - #include "System.h" - #include "System/SysThreads.h" diff --git a/packages/games/emulators/pcsx2sa/patches/001-pcsx2-wx.patch b/packages/games/emulators/pcsx2sa/patches/001-pcsx2-wx.patch deleted file mode 100644 index 73aea8540..000000000 --- a/packages/games/emulators/pcsx2sa/patches/001-pcsx2-wx.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 17e9c5e..30a52e0 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -48,22 +48,22 @@ else() - # Fedora uses an extra non-standard option ... Arch must be the first option. - # They do uname -m if missing so only fix for cross compilations. - # http://pkgs.fedoraproject.org/cgit/wxGTK.git/plain/wx-config -- if(Fedora AND CMAKE_CROSSCOMPILING) -- set(wxWidgets_CONFIG_OPTIONS --arch ${PCSX2_TARGET_ARCHITECTURES} --unicode=yes) -- else() -- set(wxWidgets_CONFIG_OPTIONS --unicode=yes) -- endif() -+ #if(Fedora AND CMAKE_CROSSCOMPILING) -+ # set(wxWidgets_CONFIG_OPTIONS --arch ${PCSX2_TARGET_ARCHITECTURES} --unicode=yes) -+ #else() -+ # set(wxWidgets_CONFIG_OPTIONS --unicode=yes) -+ #endif() - - # I'm removing the version check, because it excludes newer versions and requires specifically 3.0. - #list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0) - - # The wx version must be specified so a mix of gtk2 and gtk3 isn't used - # as that can cause compile errors. -- if(GTK2_API AND NOT APPLE) -- list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk2) -- elseif(NOT APPLE) -- list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3) -- endif() -+ #if(GTK2_API AND NOT APPLE) -+ # list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk2) -+ #elseif(NOT APPLE) -+ # list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3) -+ #endif() - - # wx2.8 => /usr/bin/wx-config-2.8 - # lib32-wx2.8 => /usr/bin/wx-config32-2.8 -@@ -71,39 +71,39 @@ else() - # I'm going to take a wild guess and predict this: - # lib32-wx3.0 => /usr/bin/wx-config32-3.0 - # FindwxWidgets only searches for wx-config. -- if(CMAKE_CROSSCOMPILING) -- # May need to fix the filenames for lib32-wx3.0. -- if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386") -- if (Fedora AND EXISTS "/usr/bin/wx-config-3.0") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0") -- endif() -- if (EXISTS "/usr/bin/wx-config32") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32") -- endif() -- if (EXISTS "/usr/bin/wx-config32-3.0") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-3.0") -- endif() -- endif() -- else() -- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/local/bin/wxgtk3u-3.0-config") -- endif() -- if(EXISTS "/usr/bin/wx-config-3.2") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.2") -- endif() -- if(EXISTS "/usr/bin/wx-config-3.1") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.1") -- endif() -- if(EXISTS "/usr/bin/wx-config-3.0") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0") -- endif() -- if(EXISTS "/usr/bin/wx-config") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config") -- endif() -- if(NOT GTK2_API AND EXISTS "/usr/bin/wx-config-gtk3") -- set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-gtk3") -- endif() -- endif() -+ #if(CMAKE_CROSSCOMPILING) -+ # # May need to fix the filenames for lib32-wx3.0. -+ # if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386") -+ # if (Fedora AND EXISTS "/usr/bin/wx-config-3.0") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0") -+ # endif() -+ # if (EXISTS "/usr/bin/wx-config32") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32") -+ # endif() -+ # if (EXISTS "/usr/bin/wx-config32-3.0") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-3.0") -+ # endif() -+ # endif() -+ #else() -+ # if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/local/bin/wxgtk3u-3.0-config") -+ # endif() -+ # if(EXISTS "/usr/bin/wx-config-3.2") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.2") -+ # endif() -+ # if(EXISTS "/usr/bin/wx-config-3.1") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.1") -+ # endif() -+ # if(EXISTS "/usr/bin/wx-config-3.0") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0") -+ # endif() -+ # if(EXISTS "/usr/bin/wx-config") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config") -+ # endif() -+ # if(NOT GTK2_API AND EXISTS "/usr/bin/wx-config-gtk3") -+ # set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-gtk3") -+ # endif() -+ #endif() - - find_package(wxWidgets REQUIRED base core adv) - include(${wxWidgets_USE_FILE}) diff --git a/packages/games/emulators/pcsx2sa/patches/002-pcsx2-cmake-findpcap.patch b/packages/games/emulators/pcsx2sa/patches/002-pcsx2-cmake-findpcap.patch deleted file mode 100644 index 3d8d6670c..000000000 --- a/packages/games/emulators/pcsx2sa/patches/002-pcsx2-cmake-findpcap.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/cmake/FindPCAP.cmake b/cmake/FindPCAP.cmake -index 4712b31b5e..5b96656bab 100644 ---- a/cmake/FindPCAP.cmake -+++ b/cmake/FindPCAP.cmake -@@ -44,26 +44,7 @@ find_package_handle_standard_args(PCAP DEFAULT_MSG - - include(CheckCSourceCompiles) - set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARY}) --check_c_source_compiles("int main() { return 0; }" PCAP_LINKS_SOLO) --set(CMAKE_REQUIRED_LIBRARIES) -- --# check if linking against libpcap also needs to link against a thread library --if (NOT PCAP_LINKS_SOLO) -- find_package(Threads) -- if (THREADS_FOUND) -- set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) -- check_c_source_compiles("int main() { return 0; }" PCAP_NEEDS_THREADS) -- set(CMAKE_REQUIRED_LIBRARIES) -- endif () -- if (THREADS_FOUND AND PCAP_NEEDS_THREADS) -- set(_tmp ${PCAP_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) -- list(REMOVE_DUPLICATES _tmp) -- set(PCAP_LIBRARY ${_tmp} -- CACHE STRING "Libraries needed to link against libpcap" FORCE) -- else () -- message(FATAL_ERROR "Couldn't determine how to link against libpcap") -- endif () --endif () -+set(PCAP_LIBRARY ${PCAP_LIBRARY} CACHE STRING "Libraries needed to link against libpcap" FORCE) - - include(CheckFunctionExists) - set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARY}) diff --git a/packages/games/emulators/pcsx2sa/patches/003-path.patch b/packages/games/emulators/pcsx2sa/patches/003-path.patch deleted file mode 100644 index a59fbaae9..000000000 --- a/packages/games/emulators/pcsx2sa/patches/003-path.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp -index 507348e73..71cd04d64 100644 ---- a/pcsx2/gui/AppConfig.cpp -+++ b/pcsx2/gui/AppConfig.cpp -@@ -202,22 +202,22 @@ namespace PathDefs - - wxDirName GetSnapshots() - { -- return GetDocuments() + Base::Snapshots(); -+ return wxDirName("/storage/roms/screenshots"); - } - - wxDirName GetBios() - { -- return GetDocuments() + Base::Bios(); -+ return wxDirName("/storage/roms/bios"); - } - - wxDirName GetCheats() - { -- return GetDocuments() + Base::Cheats(); -+ return wxDirName("/storage/cheats/ps2/cheats"); - } - - wxDirName GetCheatsWS() - { -- return GetDocuments() + Base::CheatsWS(); -+ return wxDirName("/storage/cheats/ps2/cheats_ws"); - } - - wxDirName GetDocs() -@@ -231,12 +231,12 @@ namespace PathDefs - - wxDirName GetSavestates() - { -- return GetDocuments() + Base::Savestates(); -+ return wxDirName("/storage/saves/ps2"); - } - - wxDirName GetMemoryCards() - { -- return GetDocuments() + Base::MemoryCards(); -+ return wxDirName("/storage/saves/ps2"); - } - - wxDirName GetSettings() -@@ -246,7 +246,7 @@ namespace PathDefs - - wxDirName GetLogs() - { -- return GetDocuments() + Base::Logs(); -+ return wxDirName("/var/log"); - } - - wxDirName GetResources() -@@ -266,7 +266,7 @@ namespace PathDefs - - wxDirName GetCache() - { -- return GetDocuments() + Base::Cache(); -+ return wxDirName("/system/cache/ps2"); - } - - wxDirName GetTextures() -@@ -1092,7 +1092,7 @@ void RelocateLogfile() - { - g_Conf->Folders.Logs.Mkdir(); - -- std::string newlogname(StringUtil::wxStringToUTF8String(Path::CombineWx(g_Conf->Folders.Logs.ToString(), L"emuLog.txt"))); -+ std::string newlogname(StringUtil::wxStringToUTF8String(Path::CombineWx(g_Conf->Folders.Logs.ToString(), L"PCSX2-emuLog.txt"))); - - if ((emuLog != NULL) && (emuLogName != newlogname)) - { diff --git a/packages/games/emulators/pcsx2sa/patches/004-pads-order.patch b/packages/games/emulators/pcsx2sa/patches/004-pads-order.patch deleted file mode 100644 index 0a6049d30..000000000 --- a/packages/games/emulators/pcsx2sa/patches/004-pads-order.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/pcsx2/PAD/Linux/SDL/joystick.cpp b/pcsx2/PAD/Linux/SDL/joystick.cpp -index 933bc4f..84be6d4 100644 ---- a/pcsx2/PAD/Linux/SDL/joystick.cpp -+++ b/pcsx2/PAD/Linux/SDL/joystick.cpp -@@ -21,6 +21,32 @@ - // Joystick definitions // - ////////////////////////// - -+void readSDL_PADSORDERCONFIG(int* SDL_PADSORDERCONFIG) { -+ char* env; -+ char val[16]; -+ int pos = 0, pos_start = 0, n = 0; -+ -+ for(int i=0; i<32; i++) SDL_PADSORDERCONFIG[i] = i; -+ -+ env = getenv("SDL_PADSORDERCONFIG"); -+ if(env != NULL) { -+ while(env[pos] != '\0') { -+ if(env[pos] == ';') { -+ if(pos-pos_start > 15) return; -+ strncpy(val, env+pos_start, pos-pos_start); -+ val[pos-pos_start] = '\0'; -+ SDL_PADSORDERCONFIG[n++] = atoi(val); -+ pos_start = pos+1; -+ } -+ pos++; -+ } -+ if(pos-pos_start > 15) return; -+ strncpy(val, env+pos_start, pos-pos_start); -+ val[pos-pos_start] = '\0'; -+ SDL_PADSORDERCONFIG[n] = atoi(val); -+ } -+} -+ - // opens handles to all possible joysticks - void JoystickInfo::EnumerateJoysticks(std::vector>& vjoysticks) - { -@@ -64,9 +90,12 @@ void JoystickInfo::EnumerateJoysticks(std::vector>& vjoy - - vjoysticks.clear(); - -+ int SDL_PADSORDERCONFIG[32]; -+ readSDL_PADSORDERCONFIG(SDL_PADSORDERCONFIG); -+ - for (int i = 0; i < SDL_NumJoysticks(); ++i) - { -- vjoysticks.push_back(std::unique_ptr(new JoystickInfo(i))); -+ vjoysticks.push_back(std::unique_ptr(new JoystickInfo(SDL_PADSORDERCONFIG[i]))); - // Something goes wrong in the init, let's drop it - if (!vjoysticks.back()->IsProperlyInitialized()) - vjoysticks.pop_back(); diff --git a/packages/games/emulators/pcsx2sa/patches/006-multitap.patch b/packages/games/emulators/pcsx2sa/patches/006-multitap.patch deleted file mode 100644 index e274ea4b1..000000000 --- a/packages/games/emulators/pcsx2sa/patches/006-multitap.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/pcsx2/PAD/Linux/Global.h b/pcsx2/PAD/Linux/Global.h -index af8859c..d09f7c4 100644 ---- a/pcsx2/PAD/Linux/Global.h -+++ b/pcsx2/PAD/Linux/Global.h -@@ -15,7 +15,7 @@ - - #pragma once - --static const int GAMEPAD_NUMBER = 2; -+static const int GAMEPAD_NUMBER = 8; - static const int MAX_KEYS = 24; - - #include -diff --git a/pcsx2/PAD/Linux/state_management.cpp b/pcsx2/PAD/Linux/state_management.cpp -index 37a0867..80aea50 100644 ---- a/pcsx2/PAD/Linux/state_management.cpp -+++ b/pcsx2/PAD/Linux/state_management.cpp -@@ -178,6 +178,17 @@ u8 pad_poll(u8 value) - - Pad* pad = &pads[query.port][query.slot]; - -+ int padNum = -1; -+ if(query.port == 0 && query.slot == 0 && device_manager.devices.size() > 0) padNum = 0; -+ if(query.port == 0 && query.slot == 1 && device_manager.devices.size() > 2) padNum = 2; -+ if(query.port == 0 && query.slot == 2 && device_manager.devices.size() > 3) padNum = 3; -+ if(query.port == 0 && query.slot == 3 && device_manager.devices.size() > 4) padNum = 4; -+ if(query.port == 1 && query.slot == 0 && device_manager.devices.size() > 1) padNum = 1; -+ if(query.port == 1 && query.slot == 1 && device_manager.devices.size() > 5) padNum = 5; -+ if(query.port == 1 && query.slot == 2 && device_manager.devices.size() > 6) padNum = 6; -+ if(query.port == 1 && query.slot == 3 && device_manager.devices.size() > 7) padNum = 7; -+ if(padNum == -1) return 0; -+ - if (query.lastByte == 0) - { - query.lastByte++; -@@ -233,7 +244,7 @@ u8 pad_poll(u8 value) - b1=b1 & 0x1f; - #endif - -- uint16_t buttons = g_key_status.get(query.port); -+ uint16_t buttons = g_key_status.get(padNum); - - query.numBytes = 5; - -@@ -244,28 +255,28 @@ u8 pad_poll(u8 value) - { // ANALOG || DS2 native - query.numBytes = 9; - -- query.response[5] = g_key_status.get(query.port, PAD_R_RIGHT); -- query.response[6] = g_key_status.get(query.port, PAD_R_UP); -- query.response[7] = g_key_status.get(query.port, PAD_L_RIGHT); -- query.response[8] = g_key_status.get(query.port, PAD_L_UP); -+ query.response[5] = g_key_status.get(padNum, PAD_R_RIGHT); -+ query.response[6] = g_key_status.get(padNum, PAD_R_UP); -+ query.response[7] = g_key_status.get(padNum, PAD_L_RIGHT); -+ query.response[8] = g_key_status.get(padNum, PAD_L_UP); - - if (pad->mode != MODE_ANALOG) - { // DS2 native - query.numBytes = 21; - -- query.response[9] = !test_bit(buttons, 13) ? g_key_status.get(query.port, PAD_RIGHT) : 0; -- query.response[10] = !test_bit(buttons, 15) ? g_key_status.get(query.port, PAD_LEFT) : 0; -- query.response[11] = !test_bit(buttons, 12) ? g_key_status.get(query.port, PAD_UP) : 0; -- query.response[12] = !test_bit(buttons, 14) ? g_key_status.get(query.port, PAD_DOWN) : 0; -- -- query.response[13] = !test_bit(buttons, 4) ? g_key_status.get(query.port, PAD_TRIANGLE) : 0; -- query.response[14] = !test_bit(buttons, 5) ? g_key_status.get(query.port, PAD_CIRCLE) : 0; -- query.response[15] = !test_bit(buttons, 6) ? g_key_status.get(query.port, PAD_CROSS) : 0; -- query.response[16] = !test_bit(buttons, 7) ? g_key_status.get(query.port, PAD_SQUARE) : 0; -- query.response[17] = !test_bit(buttons, 2) ? g_key_status.get(query.port, PAD_L1) : 0; -- query.response[18] = !test_bit(buttons, 3) ? g_key_status.get(query.port, PAD_R1) : 0; -- query.response[19] = !test_bit(buttons, 0) ? g_key_status.get(query.port, PAD_L2) : 0; -- query.response[20] = !test_bit(buttons, 1) ? g_key_status.get(query.port, PAD_R2) : 0; -+ query.response[9] = !test_bit(buttons, 13) ? g_key_status.get(padNum, PAD_RIGHT) : 0; -+ query.response[10] = !test_bit(buttons, 15) ? g_key_status.get(padNum, PAD_LEFT) : 0; -+ query.response[11] = !test_bit(buttons, 12) ? g_key_status.get(padNum, PAD_UP) : 0; -+ query.response[12] = !test_bit(buttons, 14) ? g_key_status.get(padNum, PAD_DOWN) : 0; -+ -+ query.response[13] = !test_bit(buttons, 4) ? g_key_status.get(padNum, PAD_TRIANGLE) : 0; -+ query.response[14] = !test_bit(buttons, 5) ? g_key_status.get(padNum, PAD_CIRCLE) : 0; -+ query.response[15] = !test_bit(buttons, 6) ? g_key_status.get(padNum, PAD_CROSS) : 0; -+ query.response[16] = !test_bit(buttons, 7) ? g_key_status.get(padNum, PAD_SQUARE) : 0; -+ query.response[17] = !test_bit(buttons, 2) ? g_key_status.get(padNum, PAD_L1) : 0; -+ query.response[18] = !test_bit(buttons, 3) ? g_key_status.get(padNum, PAD_R1) : 0; -+ query.response[19] = !test_bit(buttons, 0) ? g_key_status.get(padNum, PAD_L2) : 0; -+ query.response[20] = !test_bit(buttons, 1) ? g_key_status.get(padNum, PAD_R2) : 0; - } - } - diff --git a/packages/games/emulators/pcsx2sa/patches/007-notranslatedopt.patch b/packages/games/emulators/pcsx2sa/patches/007-notranslatedopt.patch deleted file mode 100644 index 23f252dd5..000000000 --- a/packages/games/emulators/pcsx2sa/patches/007-notranslatedopt.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp -index 5280d71..4c79324 100644 ---- a/pcsx2/gui/Panels/MemoryCardListView.cpp -+++ b/pcsx2/gui/Panels/MemoryCardListView.cpp -@@ -52,10 +52,10 @@ void BaseMcdListView::LoadSaveColumns( IniInterface& ini ) - - int width = GetColumnWidth(col); - -- ini.Entry( label, width, cinfo.width ); -+ //ini.Entry( label, width, cinfo.width ); - -- if (ini.IsLoading()) -- SetColumnWidth(col, width); -+ //if (ini.IsLoading()) -+ // SetColumnWidth(col, width); - } - } - diff --git a/packages/games/emulators/pcsx2sa/patches/008-statename.patch b/packages/games/emulators/pcsx2sa/patches/008-statename.patch deleted file mode 100644 index 7d7933e3e..000000000 --- a/packages/games/emulators/pcsx2sa/patches/008-statename.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp -index e7981ac..00bd6bd 100644 ---- a/pcsx2/SaveState.cpp -+++ b/pcsx2/SaveState.cpp -@@ -117,20 +117,7 @@ std::string SaveStateBase::GetSavestateFolder(int slot, bool isSavingOrLoading) - CRCvalue = "None"; - } - -- const std::string dir(StringUtil::StdStringFromFormat("%s" FS_OSPATH_SEPARATOR_STR "%s - (%s)", -- g_Conf->Folders.Savestates.ToUTF8().data(), serialName.c_str(), CRCvalue.c_str())); -- -- if (isSavingOrLoading) -- { -- if (!FileSystem::DirectoryExists(dir.c_str())) -- { -- // sstates should exist, no need to create it -- FileSystem::CreateDirectoryPath(dir.c_str(), false); -- } -- } -- -- return Path::Combine(dir, StringUtil::StdStringFromFormat("%s (%s).%02d.p2s", -- serialName.c_str(), CRCvalue.c_str(), slot)); -+ return (g_Conf->Folders.Savestates + Path::GetFilename(g_Conf->CurrentIso)).GetFullPath().ToUTF8().data() + StringUtil::StdStringFromFormat(".%d", slot); - } - #endif - diff --git a/packages/games/emulators/pcsx2sa/patches/009-no-effects.patch b/packages/games/emulators/pcsx2sa/patches/009-no-effects.patch deleted file mode 100644 index 904a098fb..000000000 --- a/packages/games/emulators/pcsx2sa/patches/009-no-effects.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pcsx2/PAD/Linux/wx_dialog/dialog.h b/pcsx2/PAD/Linux/wx_dialog/dialog.h -index 642cecfc2..2a4c5d759 100644 ---- a/pcsx2/PAD/Linux/wx_dialog/dialog.h -+++ b/pcsx2/PAD/Linux/wx_dialog/dialog.h -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+//#include - #include - #include - #include diff --git a/packages/games/emulators/pcsx2sa/sources/start_pcsx2.sh b/packages/games/emulators/pcsx2sa/sources/start_pcsx2.sh index 9a2e58f0f..3150d88ef 100755 --- a/packages/games/emulators/pcsx2sa/sources/start_pcsx2.sh +++ b/packages/games/emulators/pcsx2sa/sources/start_pcsx2.sh @@ -5,6 +5,10 @@ . /etc/profile ARG=${1//[\\]/} -export SDL_AUDIODRIVER=alsa -unset XDG_RUNTIME_DIR -${FAST_CORES} pcsx2 --fullscreen "$ARG" +set_audio alsa +export SDL_AUDIODRIVER=alsa +if [ ! -d "/storage/.config/PCSX2" ] +then + cp -rf /usr/config/PCSX2 /storage/.config +fi +${FAST_CORES} @APPIMAGE@ "$ARG" diff --git a/packages/graphics/gtk3/package.mk b/packages/graphics/gtk3/package.mk index 573acd7a2..d141974e4 100644 --- a/packages/graphics/gtk3/package.mk +++ b/packages/graphics/gtk3/package.mk @@ -8,30 +8,14 @@ PKG_SHA256="dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon wayland libepoxy" +PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon wayland wayland-protocols libepoxy libpng tiff libjpeg-turbo libffi" PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info" PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System." PKG_BUILD_FLAGS="-sysroot" -PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \ - -Dcloudproviders=false \ - -Dcolord=no \ - -Ddemos=false \ - -Dexamples=false \ - -Dgtk_doc=false \ - -Dintrospection=false \ - -Dman=false \ - -Dprint_backends=file,lpr \ - -Dquartz_backend=false \ - -Dtests=false \ - -Dwayland_backend=true \ - -Dwin32_backend=false \ - -Dxinerama=no \ - -Dbuiltin_immodules=yes \ - -Dx11_backend=true" +PKG_MESON_OPTS_TARGET=" -Dintrospection=false \ + -Dbroadway_backend=true \ + -Dcolord=yes \ + -Dman=false \ + -Dgtk_doc=false" -pre_configure_target() { - # ${TOOLCHAIN}/bin/glib-compile-resources requires ${TOOLCHAIN}/lib/libffi.so.6 - export LD_LIBRARY_PATH="${TOOLCHAIN}/lib:${LD_LIBRARY_PATH}" - #export GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_MKENUMS=glib-mkenums GLIB_GENMARSHAL=glib-genmarshal -} diff --git a/packages/graphics/gtk3/patches/disable-to-pixdata-build.patch b/packages/graphics/gtk3/patches/disable-to-pixdata-build.patch deleted file mode 100644 index c42f8a854..000000000 --- a/packages/graphics/gtk3/patches/disable-to-pixdata-build.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/gtk/gen-gtk-gresources-xml.py 2021-02-24 19:13:19.000000000 +0000 -+++ b/gtk/gen-gtk-gresources-xml.py 2021-04-03 23:52:35.000000000 +0000 -@@ -23,11 +23,6 @@ - theme/Adwaita/gtk-contained-dark.css - ''' - --for f in get_files('theme/Adwaita/assets', '.png'): -- xml += ' theme/Adwaita/assets/{0}\n'.format(f) -- --xml += '\n' -- - for f in get_files('theme/Adwaita/assets', '.svg'): - xml += ' theme/Adwaita/assets/{0}\n'.format(f) - -@@ -38,11 +33,6 @@ - theme/HighContrast/gtk-contained-inverse.css - ''' - --for f in get_files('theme/HighContrast/assets', '.png'): -- xml += ' theme/HighContrast/assets/{0}\n'.format(f) -- --xml += '\n' -- - for f in get_files('theme/HighContrast/assets', '.svg'): - xml += ' theme/HighContrast/assets/{0}\n'.format(f) - diff --git a/packages/jelos/sources/autostart/common/005-alsa b/packages/jelos/sources/autostart/common/005-alsa index 3d0a63501..08b2644ed 100755 --- a/packages/jelos/sources/autostart/common/005-alsa +++ b/packages/jelos/sources/autostart/common/005-alsa @@ -25,4 +25,4 @@ then fi VOL=$(get_setting "audio.volume" 2>/dev/null) -amixer set "${DEVICE_AUDIO_MIXER}" ${VOL}% +amixer -M set "${DEVICE_AUDIO_MIXER}" ${VOL}% diff --git a/packages/jelos/sources/scripts/batocera-config b/packages/jelos/sources/scripts/batocera-config index 8948fb6f5..4b9c7b553 100755 --- a/packages/jelos/sources/scripts/batocera-config +++ b/packages/jelos/sources/scripts/batocera-config @@ -192,7 +192,7 @@ if [ "$command" == "audio" ];then cmdVal="1" fi echo "setting audio output mode : $mode" >> $log - amixer cset numid=3 $cmdVal || exit 1 + amixer -M cset numid=3 $cmdVal || exit 1 elif [[ "${arch}" =~ "x86" ]] then # auto: no .asoundrc file @@ -222,12 +222,12 @@ if [ "$command" == "volume" ];then # on my pc, the master is turned off at boot # i don't know what are the rules to set here. - amixer set ${DEVICE_AUDIO_MIXER} unmute || exit 1 - amixer set ${DEVICE_AUDIO_MIXER} -- ${mode}% || exit 1 + amixer -M set ${DEVICE_AUDIO_MIXER} unmute || exit 1 + amixer -M set ${DEVICE_AUDIO_MIXER} -- ${mode}% || exit 1 # maximize the sound to be sure it's not 0, allow errors - amixer set PCM -- 100% #|| exit 1 - amixer set Headphone -- 100% #|| exit 1 + amixer -M set PCM -- 100% #|| exit 1 + amixer -M set Headphone -- 100% #|| exit 1 exit 0 fi exit 12 diff --git a/packages/jelos/sources/scripts/rr_audio.sh b/packages/jelos/sources/scripts/rr_audio.sh index 5eb995370..13586b6d3 100755 --- a/packages/jelos/sources/scripts/rr_audio.sh +++ b/packages/jelos/sources/scripts/rr_audio.sh @@ -71,7 +71,7 @@ pulseaudio_sink_unload() { fi # Restore ALSA Master volume to 100% - amixer -q set ${MIXER},0 ${RR_AUDIO_VOLUME}% unmute >/dev/null 2>&1 + amixer -M -q set ${MIXER},0 ${RR_AUDIO_VOLUME}% unmute >/dev/null 2>&1 echo "Set-Audio: ALSA mixer restore volume to ${RR_AUDIO_VOLUME}%" fi systemctl stop pulseaudio >/dev/null 2>&1 diff --git a/packages/jelos/sources/scripts/runemu.sh b/packages/jelos/sources/scripts/runemu.sh index 823bb2bbf..622195e65 100755 --- a/packages/jelos/sources/scripts/runemu.sh +++ b/packages/jelos/sources/scripts/runemu.sh @@ -287,8 +287,8 @@ then fi ;; "ps2") - jslisten set "pcsx2" - if [ "$EMU" = "pxsx2sa" ]; then + jslisten set "-9 pcsx2" + if [ "$EMU" = "pcsx2sa" ]; then RUNTHIS='${TBASH} /usr/bin/start_pcsx2.sh "${ROMNAME}"' fi ;; diff --git a/packages/sysutils/ryzenadj/package.mk b/packages/sysutils/ryzenadj/package.mk index 86dfedec8..c854897ab 100644 --- a/packages/sysutils/ryzenadj/package.mk +++ b/packages/sysutils/ryzenadj/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="ryzenadj" -PKG_VERSION="a3b8ba4" +PKG_VERSION="feecd88d29e555fa743044dad623fb96dded2b93" PKG_LICENSE="GPL" PKG_SITE="https://github.com/FlyGoat/RyzenAdj" PKG_URL="${PKG_SITE}.git" diff --git a/packages/sysutils/sleep/sources/sleep.sh b/packages/sysutils/sleep/sources/sleep.sh index 381d7fbbd..a488119fa 100755 --- a/packages/sysutils/sleep/sources/sleep.sh +++ b/packages/sysutils/sleep/sources/sleep.sh @@ -52,7 +52,7 @@ case $1 in fi DEVICE_VOLUME=$(get_setting "audio.volume" 2>/dev/null) - amixer set "${DEVICE_AUDIO_MIXER}" ${DEVICE_VOLUME}% 2>&1 >/dev/null + amixer -M set "${DEVICE_AUDIO_MIXER}" ${DEVICE_VOLUME}% 2>&1 >/dev/null ### Call the brightness script to set to the last saved value. /usr/lib/autostart/common/006-brightness diff --git a/packages/sysutils/system-utils/sources/scripts/headphone_sense b/packages/sysutils/system-utils/sources/scripts/headphone_sense index b9ed3cc0e..38fd1376d 100755 --- a/packages/sysutils/system-utils/sources/scripts/headphone_sense +++ b/packages/sysutils/system-utils/sources/scripts/headphone_sense @@ -24,11 +24,11 @@ HP_OFF='*(SW_HEADPHONE_INSERT), value 1*' evtest "${DEVICE}" | while read line; do case $line in (${HP_ON}) - amixer cset name='Playback Path' HP + amixer -M cset name='Playback Path' HP set_setting "audio.device" "headphone" ;; (${HP_OFF}) - amixer cset name='Playback Path' SPK + amixer -M cset name='Playback Path' SPK set_setting "audio.device" "speakers" ;; esac diff --git a/packages/sysutils/system-utils/sources/scripts/system_utils b/packages/sysutils/system-utils/sources/scripts/system_utils index 1687a50ea..e2fc34ce3 100755 --- a/packages/sysutils/system-utils/sources/scripts/system_utils +++ b/packages/sysutils/system-utils/sources/scripts/system_utils @@ -17,12 +17,12 @@ CURRENTAUDIO=$(get_setting "audio.device") case "${CURRENTAUDIO}" in "headphone") echo "setting speakers" - amixer cset name='Playback Path' SPK + amixer -M cset name='Playback Path' SPK set_setting "audio.device" "speakers" ;; "auto"|"speakers"|*) echo "setting headphones" - amixer cset name='Playback Path' HP + amixer -M cset name='Playback Path' HP set_setting "audio.device" "headphone" ;; esac @@ -33,12 +33,12 @@ if [ "${1}" == "setaudio" ];then case "${2}" in "headphone") echo "setting headphones" - amixer cset name='Playback Path' HP + amixer -M cset name='Playback Path' HP set_setting "audio.device" "headphone" ;; "auto"|"speakers"|*) echo "setting speakers" - amixer cset name='Playback Path' SPK + amixer -M cset name='Playback Path' SPK set_setting "audio.device" "speakers" ;; esac @@ -62,7 +62,7 @@ MINVOL=0 fi [ "$STEPVOL" -ge "$MAXVOL" ] && STEPVOL="$MAXVOL" [ "$STEPVOL" -le "$MINVOL" ] && STEPVOL="$MINVOL" - amixer set "${DEVICE_AUDIO_MIXER}" ${STEPVOL}% + amixer -M set "${DEVICE_AUDIO_MIXER}" ${STEPVOL}% alsactl store -f /storage/.config/asound.state set_setting "audio.volume" ${STEPVOL} fi diff --git a/scripts/build b/scripts/build index 5d5c9dfb9..2ed336c95 100755 --- a/scripts/build +++ b/scripts/build @@ -223,6 +223,21 @@ if [ -f "${PKG_CONFIGURE_SCRIPT}" -o -f "${PKG_CMAKE_SCRIPT}" -o -f "${PKG_MESON MESON_CONF="${PKG_REAL_BUILD}/meson.conf" fi +# configure +if [ -n "${PKG_DEPENDS_CONFIG}" -a -n "${PKG_INSTALL}" ]; then + for pkg in ${PKG_DEPENDS_CONFIG}; do + for dir in "$(get_install_dir ${pkg})"/{usr/local/,usr/,}{lib/,share/}pkgconfig; do + if [ -d "${dir}" ]; then + build_msg "CLR_TOOLCHAIN" "PKG_CONFIG_PATH" "${dir}" + [ -n "${PKG_CONFIG_PATH}" ] && PKG_CONFIG_PATH+=":" + PKG_CONFIG_PATH+="${dir}" + fi + done + done + + export PKG_CONFIG_PATH +fi + # configure pkg_call_exists pre_configure && pkg_call pre_configure pkg_call_exists pre_configure_${TARGET} && pkg_call pre_configure_${TARGET} diff --git a/scripts/extract b/scripts/extract index 927d9a7e0..f84c5a049 100755 --- a/scripts/extract +++ b/scripts/extract @@ -68,6 +68,11 @@ case ${PKG_SOURCE_NAME} in *.rar) unrar x ${FULL_SOURCE_PATH} ${2} ;; + *.AppImage) + FULL_DEST_PATH="${2}/${PKG_NAME}-${PKG_VERSION}" + mkdir ${FULL_DEST_PATH} + cp -f ${FULL_SOURCE_PATH} ${FULL_DEST_PATH} + ;; *) FULL_DEST_PATH="${2}/${PKG_NAME}-${PKG_VERSION}" mkdir ${FULL_DEST_PATH}