Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Makefile #3901

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Improve Makefile #3901

merged 2 commits into from
Jul 12, 2023

Conversation

DingDongSoLong4
Copy link
Collaborator

These are some more Makefile and general build improvements.

  • -buildmode=pie is no longer used when building for arm32. Hopefully this fixes the new bootlooping issues, but I'll need someone with the actual hardware to test it.
  • phasher is now included in the build* and cross-compile-* targets. I've added separate stash* and phasher* targets to build them separately.

And then I've updated the DEVELOPMENT.md readme, adding a few more commands and improving clarity.

I haven't changed any CI configs, because I'm not sure what exactly is going on there and I don't want to break anything. They'll need to be updated if we are to distribute phasher binaries.

@WithoutPants WithoutPants added bug Something isn't working chore Pull requests for refactoring and admin work labels Jul 11, 2023
@WithoutPants WithoutPants added this to the Version 0.22.0 milestone Jul 11, 2023
WithoutPants
WithoutPants approved these changes Jul 11, 2023
View reviewed changes
Copy link
Collaborator

@WithoutPants WithoutPants left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed the frontend targets to ui instead to be consistent with the other targets. The shorter name is more convenient as well.

I've verified that this fixes the crash issue on raspi.

@WithoutPants WithoutPants merged commit 96f2229 into stashapp:develop Jul 12, 2023
randemgame added a commit to randemgame/SexyStash that referenced this pull request Jul 12, 2023
@randemgame
Squashed commit of the following:
2a6783b 
commit 67d4f97
Author: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date:   Wed Jul 12 11:51:52 2023 +1000

    Multiple scene URLs (stashapp#3852)

    * Add URLs scene relationship
    * Update unit tests
    * Update scene edit and details pages
    * Update scrapers to use urls
    * Post-process scenes during query scrape
    * Update UI for URLs
    * Change urls label

commit 76a4bfa
Author: chickenwingavalanche <138962341+chickenwingavalanche@users.noreply.github.com>
Date:   Tue Jul 11 19:25:24 2023 -0600

    Add keyboard shortcut to toggle video looping in scene player (stashapp#3902)

    * Use shift+L to toggle video looping in scene player

commit 3e810cf
Author: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date:   Wed Jul 12 10:53:46 2023 +1000

    Add nil checks in identify (stashapp#3905)

commit c1352f9
Author: NodudeWasTaken <75137537+NodudeWasTaken@users.noreply.github.com>
Date:   Wed Jul 12 02:45:33 2023 +0200

    Safari video height css fix (stashapp#3882)

commit f665aa8
Author: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date:   Wed Jul 12 10:38:52 2023 +1000

    Update make target in Dockerfile-CUDA

commit b2b52bc
Author: chickenwingavalanche <138962341+chickenwingavalanche@users.noreply.github.com>
Date:   Tue Jul 11 18:37:46 2023 -0600

    Add missing scene player shortcuts to Help -> Keyboard Shortcuts (stashapp#3903)

    Co-authored-by: chickenwingavalanche <chickenwingavalanche@example.com>

commit 96f2229
Author: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com>
Date:   Wed Jul 12 02:05:35 2023 +0200

    Improve Makefile (stashapp#3901)

    * Improve Makefile
    * Make ui targets consistent
    ---------
    Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

commit 278a064
Author: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date:   Tue Jul 11 19:16:22 2023 +1000

    Revert "Add AirPlay and Chromecast support (stashapp#2872)" (stashapp#3898)

    This reverts commit 8e235a2.

commit 0c0ba19
Author: Csaba Maulis <hello@senki.xyz>
Date:   Tue Jul 11 13:54:42 2023 +0800

    Add `-v/--version` flag to print version string (stashapp#3883)

    * Add `-v/--version` flag to print version string

    - Created a new flag `-v/--version` in the command-line interface to display the version number and exit.
    - Moved all version-related functions inside the config package to the new file `manager/config/version.go` to avoid circular dependencies.
    - Added a new `GetVersionString()` function to generate a formatted version string.
    - Updated references to the moved version functions.
    - Updated references in the `Makefile`.

    * Move version embeds to build package

    * Remove githash var

    ---------

    Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

commit 969af2a
Author: A Ghoul Coder <aghouleditor@protonmail.com>
Date:   Tue Jul 11 07:53:53 2023 +0200

    add phasher (stashapp#3864)

    * add phasher

    A simple `phasher` program that accepts a video file as a command line
    argument and calculates and prints its PHASH.

    The goal of this separate executable is to have a simple way to
    calculate phashes that doesn't depend on a full stash instance so that
    third-party systems and tools can independently generate PHASHes which
    can be used for interacting with stash and stash-box APIs and data.

    Currently `phasher` is built in the default make target along with
    `stash` by simply running `make`.
    Cross-platform targets have not been considered.

    Concurrency is intentionally not implemented because it is simpler to
    use [GNU Parallel](https://www.gnu.org/software/parallel/).
    For example:
    ```
    parallel phasher {} ::: *.mp4
    ```

    * standard dir structure for phasher and separate make target

    The make target still needs to be integrated into the rest of the
    Makefile so it can be built as part of normal releases.

    * phasher: basic usage output and quiet option
    * phasher: allow and process multiple command line arguments
    * phasher: camelCase identifiers
    * phasher: initialize ffmpeg and ffprobe only once

commit cbdd4d3
Author: Flashy78 <90150289+Flashy78@users.noreply.github.com>
Date:   Mon Jul 10 21:37:00 2023 -0700

    Identify: Options to skip multiple results and single name performers (stashapp#3707)

    Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

commit ff22577
Author: hontheinternet <121332499+hontheinternet@users.noreply.github.com>
Date:   Tue Jul 11 13:32:42 2023 +0900

    Add additional stats to the Stats page (stashapp#3812)

    * Add o_counter, play_duration, play_count, unique_play_count stats

commit 4f0e0e1
Author: hontheinternet <121332499+hontheinternet@users.noreply.github.com>
Date:   Tue Jul 11 13:02:09 2023 +0900

    Allow serving of interactive CSVs directly to Handy (stashapp#3756)

    * allow direct serve interactive CSVs to Handy
    ---------
    Co-authored-by: kermieisinthehouse <kermie@isinthe.house>

commit 8e235a2
Author: CJ <72030708+Teda1@users.noreply.github.com>
Date:   Mon Jul 10 22:47:11 2023 -0500

    Add AirPlay and Chromecast support (stashapp#2872)

    * dynamically load cast_sender.js
    * add https://www.gstatic.com to connectableOrigins
    * Add toggle for chromecast

commit c499c20
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jul 11 13:40:29 2023 +1000

    Bump semver from 5.7.1 to 5.7.2 in /ui/v2.5 (stashapp#3896)

    Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
    - [Release notes](https://github.com/npm/node-semver/releases)
    - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
    - [Commits](npm/node-semver@v5.7.1...v5.7.2)

    ---
    updated-dependencies:
    - dependency-name: semver
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f0d901a
Author: plato178 <137155614+plato178@users.noreply.github.com>
Date:   Tue Jul 11 03:45:20 2023 +0100

    Add codec filters (stashapp#3843)

    * Add video_codec and audio_codec filter criteria
    * Add Audio Codec and Video Codec UI filters

commit 93b41fb
Author: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date:   Tue Jul 11 11:53:49 2023 +1000

    Add folder rename detection (stashapp#3817)

commit 5c38836
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jul 11 11:40:49 2023 +1000

    Bump stylelint from 15.1.0 to 15.10.1 in /ui/v2.5 (stashapp#3889)

    Bumps [stylelint](https://github.com/stylelint/stylelint) from 15.1.0 to 15.10.1.
    - [Release notes](https://github.com/stylelint/stylelint/releases)
    - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
    - [Commits](stylelint/stylelint@15.1.0...15.10.1)

    ---
    updated-dependencies:
    - dependency-name: stylelint
      dependency-type: direct:development
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit cec9195
Author: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com>
Date:   Tue Jul 11 03:40:20 2023 +0200

    Fix scene missing flicker on scene page (stashapp#3857)

    * use useLayoutEffect
    * Remove unnecessary nullability in ScenePlayer

commit 0268565
Author: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com>
Date:   Tue Jul 11 03:36:57 2023 +0200

    Makefile cleanup (stashapp#3876)
@DingDongSoLong4 DingDongSoLong4 deleted the makefile-cleanup branch July 25, 2023 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WithoutPants WithoutPants WithoutPants approved these changes

Assignees
No one assigned
Labels
bug Something isn't working chore Pull requests for refactoring and admin work
Projects
None yet
Milestone
Version 0.22.0
Development

Successfully merging this pull request may close these issues.
2 participants
@DingDongSoLong4 @WithoutPants