Skip to content

[mchehab-zbar] Fix dependencies #29232

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

Merged
BillyONeal merged 1 commit into from
Feb 1, 2023
Merged

[mchehab-zbar] Fix dependencies #29232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions ports/mchehab-zbar/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
if(EXISTS ${CURRENT_INSTALLED_DIR}/share/zbar/copyright)
message(FATAL_ERROR "${PORT} conflicts with zbar. Please remove zbar before installing ${PORT}.")
Copy link
Member

@BillyONeal BillyONeal Feb 1, 2023

Choose a reason for hiding this comment

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

Interesting, this block seems to predate the entire idea of versioning :)

endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mchehab/zbar
REF 0.23.90
REF "${VERSION}"
SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
HEAD_REF master
PATCHES
Expand All @@ -15,35 +11,40 @@ vcpkg_from_github(
x64.patch
)

vcpkg_list(SET options)
if("nls" IN_LIST FEATURES)
vcpkg_list(APPEND options "--enable-nls")
else()
vcpkg_list(APPEND options "--disable-nls")
endif()

vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
NO_ADDITIONAL_PATHS
ADD_BIN_TO_PATH
ADDITIONAL_MSYS_PACKAGES findutils gettext gettext-devel liblzma tar xz
AUTOCONFIG
OPTIONS
--disable-video
${options}
--without-dbus
--without-gtk
--without-imagemagick
--without-java
--without-jpeg
--without-python
--without-qt
--disable-video
--without-xv
OPTIONS_RELEASE
--disable-assert
)

vcpkg_install_make()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/share/doc")
"${CURRENT_PACKAGES_DIR}/share/doc"
"${CURRENT_PACKAGES_DIR}/tools"
)

file(RENAME "${CURRENT_PACKAGES_DIR}/share/zbar" "${CURRENT_PACKAGES_DIR}/share/${PORT}")
configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
25 changes: 22 additions & 3 deletions ports/mchehab-zbar/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
{
"name": "mchehab-zbar",
"version": "0.23.90",
"port-version": 1,
"port-version": 2,
"description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.",
"homepage": "https://github.com/mchehab/zbar",
"license": "LGPL-2.1-or-later",
"supports": "windows & !uwp",
"supports": "!uwp",
"dependencies": [
{
"name": "gettext",
"host": true
},
"libiconv"
]
],
"features": {
"nls": {
"description": "Native Language Support",
"dependencies": [
"gettext",
{
"name": "gettext",
"host": true,
"features": [
"tools"
]
}
]
}
}
}
13 changes: 0 additions & 13 deletions ports/mchehab-zbar/windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@ index c8fea14..eb0a097 100644
AM_CXXFLAGS="$AM_CFLAGS"
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
diff --git a/zbar/Makefile.am b/zbar/Makefile.am
index ca54d01..6c0cd83 100644
--- a/zbar/Makefile.am
+++ b/zbar/Makefile.am
@@ -68,7 +68,7 @@ if WIN32

libzbar_la_SOURCES += processor/win.c libzbar.rc
libzbar_la_CPPFLAGS += -mthreads
-libzbar_la_LDFLAGS += -mthreads
+libzbar_la_LDFLAGS += -mthreads -Xcompiler -Wl,-DEBUG
# FIXME broken
libzbar_la_LIBADD += libzbar-rc.lo
else
diff --git a/zbar/libzbar.rc b/zbar/libzbar.rc
index 413635b..c241f82 100644
--- a/zbar/libzbar.rc
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4882,7 +4882,7 @@
},
"mchehab-zbar": {
"baseline": "0.23.90",
"port-version": 1
"port-version": 2
},
"mcpp": {
"baseline": "2.7.2.14",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mchehab-zbar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "af1f66aef9076cd2e27c941851d1549d1cbffe00",
"version": "0.23.90",
"port-version": 2
},
{
"git-tree": "545ecda77fa95f46216d944ca8ab1f7e12378930",
"version": "0.23.90",
Expand Down